diff --git a/lib/HomeAssistantHelper/strings.h b/lib/HomeAssistantHelper/strings.h
index be3118d..30f6024 100644
--- a/lib/HomeAssistantHelper/strings.h
+++ b/lib/HomeAssistantHelper/strings.h
@@ -1,6 +1,6 @@
 #pragma once
 #ifndef PROGMEM
-#define PROGMEM 
+  #define PROGMEM 
 #endif
 
 const char HA_DEVICE[]              PROGMEM = "device";
diff --git a/src/MainTask.h b/src/MainTask.h
index af851ab..befcaf0 100644
--- a/src/MainTask.h
+++ b/src/MainTask.h
@@ -24,18 +24,18 @@ protected:
   }
 
   void setup() {
-#ifdef LED_STATUS_PIN
-    pinMode(LED_STATUS_PIN, OUTPUT);
-    digitalWrite(LED_STATUS_PIN, false);
-#endif
+    #ifdef LED_STATUS_PIN
+      pinMode(LED_STATUS_PIN, OUTPUT);
+      digitalWrite(LED_STATUS_PIN, false);
+    #endif
 
-#if defined(ESP32)
-    heapSize = ESP.getHeapSize();
-#elif defined(ESP8266)
-    heapSize = 81920;
-#elif
-    heapSize = 99999;
-#endif
+    #if defined(ESP32)
+      heapSize = ESP.getHeapSize();
+    #elif defined(ESP8266)
+      heapSize = 81920;
+    #elif
+      heapSize = 99999;
+    #endif
     minFreeHeapSize = heapSize;
   }
 
@@ -87,19 +87,19 @@ protected:
       tOt->enable();
     }
 
-#ifdef LED_STATUS_PIN
-    ledStatus(LED_STATUS_PIN);
-#endif
+    #ifdef LED_STATUS_PIN
+      ledStatus(LED_STATUS_PIN);
+    #endif
 
-#ifdef USE_TELNET
-    yield();
+    #if USE_TELNET
+      yield();
 
-    // anti memory leak
-    TelnetStream.flush();
-    while (TelnetStream.available() > 0) {
-      TelnetStream.read();
-    }
-#endif
+      // anti memory leak
+      TelnetStream.flush();
+      while (TelnetStream.available() > 0) {
+        TelnetStream.read();
+      }
+    #endif
 
     if (settings.debug) {
       unsigned int freeHeapSize = ESP.getFreeHeap();
diff --git a/src/defines.h b/src/defines.h
index 2189356..90df5f7 100644
--- a/src/defines.h
+++ b/src/defines.h
@@ -2,7 +2,6 @@
 #define OT_GATEWAY_REPO             "https://github.com/Laxilef/OTGateway"
 #define AP_SSID                     "OpenTherm Gateway"
 #define AP_PASSWORD                 "otgateway123456"
-#define USE_TELNET
 
 #define EMERGENCY_TIME_TRESHOLD     120000
 #define MQTT_RECONNECT_INTERVAL     5000
@@ -17,6 +16,17 @@
 #define SETTINGS_VALID_VALUE        "stvalid" // only 8 chars!
 
 
+#ifndef WM_DEBUG_MODE
+  #define WM_DEBUG_MODE WM_DEBUG_NOTIFY
+#endif
+
+#ifndef USE_TELNET
+  #define USE_TELNET true
+#endif
+
+#ifndef DEBUG_BY_DEFAULT
+  #define DEBUG_BY_DEFAULT false
+#endif
 
 #ifndef OT_IN_PIN_DEFAULT
   #define OT_IN_PIN_DEFAULT 0
@@ -34,7 +44,7 @@
   #define SENSOR_INDOOR_PIN_DEFAULT 0
 #endif
 
-#ifdef USE_TELNET
+#if USE_TELNET
   #define INFO_STREAM TelnetStream
   #define WARN_STREAM TelnetStream
   #define ERROR_STREAM TelnetStream
diff --git a/src/main.cpp b/src/main.cpp
index 9907b69..46e83bb 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -36,7 +36,7 @@ MainTask* tMain;
 
 
 void setup() {
-  #ifndef USE_TELNET
+  #if USE_TELNET
     Serial.begin(115200);
     Serial.println("\n\n");
   #endif
@@ -83,6 +83,6 @@ void setup() {
 
 void loop() {
   #if defined(ESP32)
-  vTaskDelete(NULL);
+    vTaskDelete(NULL);
   #endif
 }