diff --git a/config.default.h b/config.default.h
index 529a8c2..a0b5b6b 100644
--- a/config.default.h
+++ b/config.default.h
@@ -329,12 +329,12 @@ DEFINE_TEMP_SENSOR(bed,       TT_THERMISTOR,  1,         THERMISTOR_EXTRUDER)
 	#define DEFINE_HEATER(...)
 #endif
 
-//               name      port   pin    pwm
-DEFINE_HEATER(extruder,	PB3)
-DEFINE_HEATER(bed,			PB4)
-// DEFINE_HEATER(fan,			PORTB, PINB4, OCR0B)
-// DEFINE_HEATER(chamber,	PORTD, PIND7, OCR2A)
-// DEFINE_HEATER(motor,		PORTD, PIND6, OCR2B)
+//            name      port
+DEFINE_HEATER(extruder, PB3)
+DEFINE_HEATER(bed,      PB4)
+// DEFINE_HEATER(fan,      PINB4)
+// DEFINE_HEATER(chamber,  PIND7)
+// DEFINE_HEATER(motor,    PIND6)
 
 /// and now because the c preprocessor isn't as smart as it could be,
 /// uncomment the ones you've listed above and comment the rest.
@@ -345,6 +345,8 @@ DEFINE_HEATER(bed,			PB4)
 #define	HEATER_EXTRUDER HEATER_extruder
 #define HEATER_BED HEATER_bed
 // #define HEATER_FAN HEATER_fan
+// #define HEATER_CHAMBER HEATER_chamber
+// #define HEATER_MOTOR HEATER_motor
 
 
 
diff --git a/config.gen3.h b/config.gen3.h
index 6349ed1..f52201d 100644
--- a/config.gen3.h
+++ b/config.gen3.h
@@ -332,12 +332,9 @@ DEFINE_TEMP_SENSOR(bed,       TT_INTERCOM,    1,         0)
 	#define DEFINE_HEATER(...)
 #endif
 
-//               name      port   pin    pwm
-// DEFINE_HEATER(extruder,	PORTB, PINB3, OCR0A)
-// DEFINE_HEATER(bed,			PORTB, PINB4, OCR0B)
-// DEFINE_HEATER(fan,			PORTB, PINB4, OCR0B)
-// DEFINE_HEATER(chamber,	PORTD, PIND7, OCR2A)
-// DEFINE_HEATER(motor,		PORTD, PIND6, OCR2B)
+//            name      port
+// DEFINE_HEATER(extruder, PINB3)
+// DEFINE_HEATER(bed,      PINB4)
 
 /** \def HEATER_EXTRUDER
 	\def HEATER_BED
@@ -353,7 +350,6 @@ DEFINE_TEMP_SENSOR(bed,       TT_INTERCOM,    1,         0)
 
 // workaround for heated bed over intercom. HEATER_BED is the intercom temp channel number.
 #define HEATER_BED 1
-// #define HEATER_FAN HEATER_fan
 
 
 
diff --git a/config.gen6.h b/config.gen6.h
index 65194b3..da03fe5 100644
--- a/config.gen6.h
+++ b/config.gen6.h
@@ -325,8 +325,7 @@ DEFINE_TEMP_SENSOR(extruder,  TT_THERMISTOR,  PINA5,     THERMISTOR_EXTRUDER)
 	#define DEFINE_HEATER(...)
 #endif
 
-//               name      port   pin    pwm
-// DEFINE_HEATER(extruder,   PORTD, PIND6, OCR2B)
+//            name      port
 DEFINE_HEATER(extruder, PD6)
 
 /// and now because the c preprocessor isn't as smart as it could be,
@@ -336,8 +335,6 @@ DEFINE_HEATER(extruder, PD6)
 /// I have searched high and low for a way to make the preprocessor do this for us, but so far I have not found a way.
 
 #define	HEATER_EXTRUDER HEATER_extruder
-// #define HEATER_BED HEATER_bed
-// #define HEATER_FAN HEATER_fan
 
 
 
diff --git a/config.gen7-v1.1-v1.3.h b/config.gen7-v1.1-v1.3.h
index 7aa0034..3fef9c5 100644
--- a/config.gen7-v1.1-v1.3.h
+++ b/config.gen7-v1.1-v1.3.h
@@ -334,9 +334,9 @@ DEFINE_TEMP_SENSOR(bed,       TT_THERMISTOR,  PINA2,     THERMISTOR_BED)
 	#define DEFINE_HEATER(...)
 #endif
 
-//               name      port   pin    pwm
-DEFINE_HEATER(extruder,	PB4)
-DEFINE_HEATER(bed, PB3)
+//            name      port
+DEFINE_HEATER(extruder, DIO4)
+DEFINE_HEATER(bed,      DIO3)
 
 /// and now because the c preprocessor isn't as smart as it could be,
 /// uncomment the ones you've listed above and comment the rest.
diff --git a/config.gen7-v1.4.h b/config.gen7-v1.4.h
index db784e2..b3dacff 100644
--- a/config.gen7-v1.4.h
+++ b/config.gen7-v1.4.h
@@ -334,9 +334,9 @@ DEFINE_TEMP_SENSOR(bed,       TT_THERMISTOR,  PINA1,     THERMISTOR_BED)
 	#define DEFINE_HEATER(...)
 #endif
 
-//               name      port   pin    pwm
-DEFINE_HEATER(extruder,	DIO4)
-DEFINE_HEATER(bed, DIO3)
+//            name      port
+DEFINE_HEATER(extruder, DIO4)
+DEFINE_HEATER(bed,      DIO3)
 
 /// and now because the c preprocessor isn't as smart as it could be,
 /// uncomment the ones you've listed above and comment the rest.
diff --git a/config.ramps-v1.2.h b/config.ramps-v1.2.h
index 058b780..b972b7c 100644
--- a/config.ramps-v1.2.h
+++ b/config.ramps-v1.2.h
@@ -330,12 +330,10 @@ DEFINE_TEMP_SENSOR(bed,       TT_THERMISTOR,  AIO1_PIN,  THERMISTOR_EXTRUDER)
 #endif
 
 // NOTE: these pins are for RAMPS V1.1 and newer. V1.0 is different
-//               name      port   pin    pwm
-DEFINE_HEATER(extruder,	PB4)
-DEFINE_HEATER(bed,			PH5)
-DEFINE_HEATER(fan,			PH6)
-// DEFINE_HEATER(chamber,	PORTD, PIND7, OCR2A)
-// DEFINE_HEATER(motor,		PORTD, PIND6, OCR2B)
+//            name      port
+DEFINE_HEATER(extruder, PB4)
+DEFINE_HEATER(bed,      PH5)
+DEFINE_HEATER(fan,      PH6)
 
 /// and now because the c preprocessor isn't as smart as it could be,
 /// uncomment the ones you've listed above and comment the rest.
@@ -345,7 +343,7 @@ DEFINE_HEATER(fan,			PH6)
 
 #define	HEATER_EXTRUDER HEATER_extruder
 #define HEATER_BED HEATER_bed
-// #define HEATER_FAN HEATER_fan
+#define HEATER_FAN HEATER_fan
 
 
 
diff --git a/config.ramps-v1.3.h b/config.ramps-v1.3.h
index e2b5bf7..600eaaa 100644
--- a/config.ramps-v1.3.h
+++ b/config.ramps-v1.3.h
@@ -334,12 +334,9 @@ DEFINE_TEMP_SENSOR(extruder,  TT_THERMISTOR,  AIO13_PIN, THERMISTOR_EXTRUDER)
 #endif
 
 // NOTE: these pins are for RAMPS V1.1 and newer. V1.0 is different
-//               name      port   pin    pwm
-DEFINE_HEATER( extruder,	PB4)
-//DEFINE_HEATER( bed,     	PH5)
-//DEFINE_HEATER( fan,     	PH6)
-// DEFINE_HEATER(chamber,	PORTD, PIND7, OCR2A)
-// DEFINE_HEATER(motor,		PORTD, PIND6, OCR2B)
+//            name      port
+DEFINE_HEATER(extruder, PB4)
+//DEFINE_HEATER( bed,     PH5)
 
 /// and now because the c preprocessor isn't as smart as it could be,
 /// uncomment the ones you've listed above and comment the rest.
@@ -349,7 +346,6 @@ DEFINE_HEATER( extruder,	PB4)
 
 #define	HEATER_EXTRUDER HEATER_extruder
 //#define HEATER_BED HEATER_bed
-// #define HEATER_FAN HEATER_fan
 
 
 
diff --git a/config.sanguinololu-v1.1.h b/config.sanguinololu-v1.1.h
index e4f78e6..a0689e7 100644
--- a/config.sanguinololu-v1.1.h
+++ b/config.sanguinololu-v1.1.h
@@ -330,12 +330,9 @@ DEFINE_TEMP_SENSOR(bed,       TT_THERMISTOR,  AIO6_PIN,  THERMISTOR_EXTRUDER)
 	#define DEFINE_HEATER(...)
 #endif
 
-//               name      port   pin    pwm
-DEFINE_HEATER(extruder,	PD5)
-DEFINE_HEATER(bed,	PD6)
-// DEFINE_HEATER(fan,			PORTB, PINB4, OCR0B)
-// DEFINE_HEATER(chamber,	PORTD, PIND7, OCR2A)
-// DEFINE_HEATER(motor,		PORTD, PIND6, OCR2B)
+//            name      port
+DEFINE_HEATER(extruder, PD5)
+DEFINE_HEATER(bed,      PD6)
 
 /// and now because the c preprocessor isn't as smart as it could be,
 /// uncomment the ones you've listed above and comment the rest.
@@ -345,7 +342,6 @@ DEFINE_HEATER(bed,	PD6)
 
 #define	HEATER_EXTRUDER HEATER_extruder
 #define HEATER_BED HEATER_bed
-// #define HEATER_FAN HEATER_fan
 
 
 
diff --git a/config.sanguinololu-v1.2.h b/config.sanguinololu-v1.2.h
index df26f57..cfda0c2 100644
--- a/config.sanguinololu-v1.2.h
+++ b/config.sanguinololu-v1.2.h
@@ -330,12 +330,9 @@ DEFINE_TEMP_SENSOR(bed,       TT_THERMISTOR,  AIO6_PIN,  THERMISTOR_BED)
 	#define DEFINE_HEATER(...)
 #endif
 
-//               name      port   pin    pwm
-DEFINE_HEATER(extruder,	PD5)
-DEFINE_HEATER(bed,	PD4)
-// DEFINE_HEATER(fan,			PORTB, PINB4, OCR0B)
-// DEFINE_HEATER(chamber,	PORTD, PIND7, OCR2A)
-// DEFINE_HEATER(motor,		PORTD, PIND6, OCR2B)
+//            name      port
+DEFINE_HEATER(extruder, PD5)
+DEFINE_HEATER(bed,      PD4)
 
 /// and now because the c preprocessor isn't as smart as it could be,
 /// uncomment the ones you've listed above and comment the rest.
@@ -345,7 +342,6 @@ DEFINE_HEATER(bed,	PD4)
 
 #define	HEATER_EXTRUDER HEATER_extruder
 #define HEATER_BED HEATER_bed
-// #define HEATER_FAN HEATER_fan