diff --git a/config/board.3drag.h b/config/board.3drag.h
index a39ea00..be62095 100644
--- a/config/board.3drag.h
+++ b/config/board.3drag.h
@@ -141,8 +141,8 @@
   For a GEN3 set temp_type to TT_INTERCOM and temp_pin to AIO0. The pin
   won't be used in this case.
 */
-//                 name      type           pin    additional
 //DEFINE_TEMP_SENSORS_START
+//                 name      type           pin    additional
 DEFINE_TEMP_SENSOR(extruder, TT_THERMISTOR, AIO13, THERMISTOR_EXTRUDER)
 DEFINE_TEMP_SENSOR(bed,      TT_THERMISTOR, AIO14, THERMISTOR_BED)
 //DEFINE_TEMP_SENSORS_END
diff --git a/config/board.gen3.h b/config/board.gen3.h
index eb51b43..5a48b13 100644
--- a/config/board.gen3.h
+++ b/config/board.gen3.h
@@ -140,8 +140,8 @@
   For a GEN3 set temp_type to TT_INTERCOM and temp_pin to AIO0. The pin
   won't be used in this case.
 */
-//                 name      type           pin    additional
 //DEFINE_TEMP_SENSORS_START
+//                 name      type           pin    additional
 DEFINE_TEMP_SENSOR(noheater, TT_INTERCOM,   AIO0,  0)
 //DEFINE_TEMP_SENSORS_END
 
diff --git a/config/board.gen6.h b/config/board.gen6.h
index edc3a90..169671f 100644
--- a/config/board.gen6.h
+++ b/config/board.gen6.h
@@ -140,8 +140,8 @@
   For a GEN3 set temp_type to TT_INTERCOM and temp_pin to AIO0. The pin
   won't be used in this case.
 */
-//                 name      type           pin    additional
 //DEFINE_TEMP_SENSORS_START
+//                 name      type           pin    additional
 DEFINE_TEMP_SENSOR(extruder, TT_THERMISTOR, AIO5,  THERMISTOR_EXTRUDER)
 //DEFINE_TEMP_SENSORS_END
 
diff --git a/config/board.gen7-v1.1-v1.3.h b/config/board.gen7-v1.1-v1.3.h
index 14ae7de..d0da944 100644
--- a/config/board.gen7-v1.1-v1.3.h
+++ b/config/board.gen7-v1.1-v1.3.h
@@ -145,8 +145,8 @@
   For a GEN3 set temp_type to TT_INTERCOM and temp_pin to AIO0. The pin
   won't be used in this case.
 */
-//                 name      type           pin    additional
 //DEFINE_TEMP_SENSORS_START
+//                 name      type           pin    additional
 DEFINE_TEMP_SENSOR(extruder, TT_THERMISTOR, AIO1,  THERMISTOR_EXTRUDER)
 DEFINE_TEMP_SENSOR(bed,      TT_THERMISTOR, AIO2,  THERMISTOR_BED)
 //DEFINE_TEMP_SENSORS_END
diff --git a/config/board.gen7-v1.4.h b/config/board.gen7-v1.4.h
index 07bbea9..8881bd8 100644
--- a/config/board.gen7-v1.4.h
+++ b/config/board.gen7-v1.4.h
@@ -146,8 +146,8 @@
   For a GEN3 set temp_type to TT_INTERCOM and temp_pin to AIO0. The pin
   won't be used in this case.
 */
-//                 name      type           pin    additional
 //DEFINE_TEMP_SENSORS_START
+//                 name      type           pin    additional
 DEFINE_TEMP_SENSOR(extruder, TT_THERMISTOR, AIO1,  THERMISTOR_EXTRUDER)
 DEFINE_TEMP_SENSOR(bed,      TT_THERMISTOR, AIO0,  THERMISTOR_BED)
 //DEFINE_TEMP_SENSORS_END
diff --git a/config/board.ramps-v1.2.h b/config/board.ramps-v1.2.h
index b0a9348..f579d55 100644
--- a/config/board.ramps-v1.2.h
+++ b/config/board.ramps-v1.2.h
@@ -142,8 +142,8 @@
   For a GEN3 set temp_type to TT_INTERCOM and temp_pin to AIO0. The pin
   won't be used in this case.
 */
-//                 name      type           pin    additional
 //DEFINE_TEMP_SENSORS_START
+//                 name      type           pin    additional
 DEFINE_TEMP_SENSOR(extruder, TT_THERMISTOR, AIO2,  THERMISTOR_EXTRUDER)
 DEFINE_TEMP_SENSOR(bed,      TT_THERMISTOR, AIO1,  THERMISTOR_BED)
 //DEFINE_TEMP_SENSORS_END
diff --git a/config/board.ramps-v1.3.h b/config/board.ramps-v1.3.h
index 27c6677..4d6b32b 100644
--- a/config/board.ramps-v1.3.h
+++ b/config/board.ramps-v1.3.h
@@ -143,8 +143,8 @@
   For a GEN3 set temp_type to TT_INTERCOM and temp_pin to AIO0. The pin
   won't be used in this case.
 */
-//                 name      type           pin    additional
 //DEFINE_TEMP_SENSORS_START
+//                 name      type           pin    additional
 DEFINE_TEMP_SENSOR(extruder, TT_THERMISTOR, AIO13, THERMISTOR_EXTRUDER)
 DEFINE_TEMP_SENSOR(bed,      TT_THERMISTOR, AIO14, THERMISTOR_BED)
 //DEFINE_TEMP_SENSORS_END
diff --git a/config/board.rumba.h b/config/board.rumba.h
index 3e08c9e..3a73d24 100644
--- a/config/board.rumba.h
+++ b/config/board.rumba.h
@@ -144,8 +144,8 @@
   For a GEN3 set temp_type to TT_INTERCOM and temp_pin to AIO0. The pin
   won't be used in this case.
 */
-//                 name      type           pin    additional
 //DEFINE_TEMP_SENSORS_START
+//                 name      type           pin    additional
 DEFINE_TEMP_SENSOR(extruder, TT_THERMISTOR, AIO15, THERMISTOR_EXTRUDER)
 DEFINE_TEMP_SENSOR(bed,      TT_THERMISTOR, AIO11, THERMISTOR_BED)
 //DEFINE_TEMP_SENSORS_END
diff --git a/config/board.sanguinololu-v1.1.h b/config/board.sanguinololu-v1.1.h
index 46eeadb..ac16435 100644
--- a/config/board.sanguinololu-v1.1.h
+++ b/config/board.sanguinololu-v1.1.h
@@ -144,8 +144,8 @@
   For a GEN3 set temp_type to TT_INTERCOM and temp_pin to AIO0. The pin
   won't be used in this case.
 */
-//                 name      type           pin    additional
 //DEFINE_TEMP_SENSORS_START
+//                 name      type           pin    additional
 DEFINE_TEMP_SENSOR(extruder, TT_THERMISTOR, AIO7,  THERMISTOR_EXTRUDER)
 DEFINE_TEMP_SENSOR(bed,      TT_THERMISTOR, AIO6,  THERMISTOR_BED)
 //DEFINE_TEMP_SENSORS_END
diff --git a/config/board.sanguinololu-v1.2.h b/config/board.sanguinololu-v1.2.h
index b8e105d..0b6dfbd 100644
--- a/config/board.sanguinololu-v1.2.h
+++ b/config/board.sanguinololu-v1.2.h
@@ -144,8 +144,8 @@
   For a GEN3 set temp_type to TT_INTERCOM and temp_pin to AIO0. The pin
   won't be used in this case.
 */
-//                 name      type           pin    additional
 //DEFINE_TEMP_SENSORS_START
+//                 name      type           pin    additional
 DEFINE_TEMP_SENSOR(extruder, TT_THERMISTOR, AIO7,  THERMISTOR_EXTRUDER)
 DEFINE_TEMP_SENSOR(bed,      TT_THERMISTOR, AIO6,  THERMISTOR_BED)
 //DEFINE_TEMP_SENSORS_END
diff --git a/config/board.sanguish.h b/config/board.sanguish.h
index 9bdaa7f..12a54a2 100644
--- a/config/board.sanguish.h
+++ b/config/board.sanguish.h
@@ -144,8 +144,8 @@
   For a GEN3 set temp_type to TT_INTERCOM and temp_pin to AIO0. The pin
   won't be used in this case.
 */
-//                 name      type           pin    additional
 //DEFINE_TEMP_SENSORS_START
+//                 name      type           pin    additional
 DEFINE_TEMP_SENSOR(extruder, TT_THERMISTOR, AIO1,  THERMISTOR_EXTRUDER)
 DEFINE_TEMP_SENSOR(bed,      TT_THERMISTOR, AIO0,  THERMISTOR_BED)
 //DEFINE_TEMP_SENSORS_END
diff --git a/config/board.teensy++-v2.0.h b/config/board.teensy++-v2.0.h
index 57f06df..57556f3 100644
--- a/config/board.teensy++-v2.0.h
+++ b/config/board.teensy++-v2.0.h
@@ -141,8 +141,8 @@
   For a GEN3 set temp_type to TT_INTERCOM and temp_pin to AIO0. The pin
   won't be used in this case.
 */
-//                 name      type           pin    additional
 //DEFINE_TEMP_SENSORS_START
+//                 name      type           pin    additional
 DEFINE_TEMP_SENSOR(extruder, TT_THERMISTOR, AIO7,  THERMISTOR_EXTRUDER)
 DEFINE_TEMP_SENSOR(bed,      TT_THERMISTOR, AIO6,  THERMISTOR_BED)
 //DEFINE_TEMP_SENSORS_END
diff --git a/config/board.teensy-v2.0.h b/config/board.teensy-v2.0.h
index f0df7c6..395ab05 100644
--- a/config/board.teensy-v2.0.h
+++ b/config/board.teensy-v2.0.h
@@ -141,8 +141,8 @@
   For a GEN3 set temp_type to TT_INTERCOM and temp_pin to AIO0. The pin
   won't be used in this case.
 */
-//                 name      type           pin    additional
 //DEFINE_TEMP_SENSORS_START
+//                 name      type           pin    additional
 DEFINE_TEMP_SENSOR(extruder, TT_THERMISTOR, AIO1,  THERMISTOR_EXTRUDER)
 DEFINE_TEMP_SENSOR(bed,      TT_THERMISTOR, AIO0,  THERMISTOR_BED)
 //DEFINE_TEMP_SENSORS_END
diff --git a/configtool/boardpanel.py b/configtool/boardpanel.py
index 66046b5..41adb23 100644
--- a/configtool/boardpanel.py
+++ b/configtool/boardpanel.py
@@ -461,8 +461,14 @@ class BoardPanel(wx.Panel):
       m = reStartSensors.match(ln)
       if m:
         fp.write(ln)
+        fp.write("//                 name      type           pin    "
+                 "additional\n");
         for s in self.sensors:
-          sstr = ", ".join(s)
+          sstr = "%-10s%-15s" % ((s[0] + ","), (s[1] + ","))
+          if len(s) == 3:
+            sstr += "%s" % (s[2])
+          else: # len(s) == 4
+            sstr += "%-7s%s" % ((s[2] + ","), s[3])
           fp.write("DEFINE_TEMP_SENSOR(%s)\n" % sstr)
         skipToSensorEnd = True
         continue