diff --git a/Template/MyCustomDevice_platformio.ini b/Template/MyCustomDevice_platformio.ini
index f68c8d3..0caf354 100644
--- a/Template/MyCustomDevice_platformio.ini
+++ b/Template/MyCustomDevice_platformio.ini
@@ -11,16 +11,7 @@ build_flags =
 	;-DHAS_CONFIG_IN_FLASH											; undefine this and add your configuration to MFCustomDevicesConfig.h to save the config in Flash !!Core FW version must be at least 2.5.2!!
 	;-DREVERSED_OUTPUT_OUTPUT										; for reversed output logic on outputs
 	;-DREVERSED_OUTPUT_OUTPUTSHIFTER								; for reversed output logic on outputshifter
-	-DMF_SEGMENT_SUPPORT
-	-DMF_LCD_SUPPORT
-	-DMF_STEPPER_SUPPORT
-	-DMF_SERVO_SUPPORT
-	-DMF_ANALOG_SUPPORT
-	-DMF_OUTPUT_SHIFTER_SUPPORT
-	-DMF_INPUT_SHIFTER_SUPPORT
-	-DMF_MUX_SUPPORT
-	-DMF_MUX_SUPPORT
-	-DMF_DIGIN_MUX_SUPPORT
+	;-DDEBUG2CMDMESSENGER											; uncomment this to get debug messages for the connector log
 	-I./src/src/MF_CustomDevice										; don't change this one!
 	-I./Template													; Include files for your custom device, replace "Template" by your folder name
 build_src_filter = 
diff --git a/platformio.ini b/platformio.ini
index 7d8d5c9..1e19786 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -29,7 +29,16 @@ build_flags =
 	-DMESSENGERBUFFERSIZE=96
 	-DMAXSTREAMBUFFERSIZE=96
 	-DDEFAULT_TIMEOUT=5000
-;	-DDEBUG2CMDMESSENGER=1
+	-DMF_SEGMENT_SUPPORT
+	-DMF_LCD_SUPPORT
+	-DMF_STEPPER_SUPPORT
+	-DMF_SERVO_SUPPORT
+	-DMF_ANALOG_SUPPORT
+	-DMF_OUTPUT_SHIFTER_SUPPORT
+	-DMF_INPUT_SHIFTER_SUPPORT
+	-DMF_MUX_SUPPORT
+	-DMF_MUX_SUPPORT
+	-DMF_DIGIN_MUX_SUPPORT
 	-I./src/src
 	-I./src/src/MF_Analog
 	-I./src/src/MF_Button