diff --git a/lib/lv_lib_zifont/lv_zifont.cpp b/lib/lv_lib_zifont/lv_zifont.cpp
index 9291ea5b..06977352 100644
--- a/lib/lv_lib_zifont/lv_zifont.cpp
+++ b/lib/lv_lib_zifont/lv_zifont.cpp
@@ -177,8 +177,8 @@ int lv_zifont_font_init(lv_font_t ** font, const char * font_path, uint16_t size
         return ZIFONT_ERROR_READING_DATA;
     }
 
-    Log.notice(TAG_FONT, F("Loaded V%d Font File: %s containing %d characters"), header.Version, font_path,
-               header.Maximumnumchars);
+    Log.verbose(TAG_FONT, F("Loaded V%d Font File: %s containing %d characters"), header.Version, font_path,
+                header.Maximumnumchars);
 
     file.close();
 
diff --git a/src/hasp.cpp b/src/hasp.cpp
index 18563ea5..352928b7 100644
--- a/src/hasp.cpp
+++ b/src/hasp.cpp
@@ -380,9 +380,9 @@ void haspSetup()
     lv_fs_res_t res;
     res = lv_fs_open(&f, "F:/test.jsonl", LV_FS_MODE_RD);
     if(res == LV_FS_RES_OK)
-        Log.error(TAG_HASP, F("Opening test.json OK"));
+        Log.verbose(TAG_HASP, F("Opening test.json OK"));
     else
-        Log.verbose(TAG_HASP, F("Opening test.json from FS failed %d"), res);
+        Log.error(TAG_HASP, F("Opening test.json from FS failed %d"), res);
 
     uint32_t btoread = 128;
     uint32_t bread   = 0;
@@ -390,17 +390,17 @@ void haspSetup()
 
     res = lv_fs_read(&f, &buffer, btoread, &bread);
     if(res == LV_FS_RES_OK) {
-        Log.error(TAG_HASP, F("Reading test.json OK %u"), bread);
+        Log.verbose(TAG_HASP, F("Reading test.json OK %u"), bread);
         buffer[127] = '\0';
-        Log.verbose(TAG_HASP, buffer);
+        Log.trace(TAG_HASP, buffer);
     } else
-        Log.verbose(TAG_HASP, F("Reading test.json from FS failed %d"), res);
+        Log.error(TAG_HASP, F("Reading test.json from FS failed %d"), res);
 
     res = lv_fs_close(&f);
     if(res == LV_FS_RES_OK)
-        Log.error(TAG_HASP, F("Closing test.json OK"));
+        Log.verbose(TAG_HASP, F("Closing test.json OK"));
     else
-        Log.verbose(TAG_HASP, F("Closing test.json on FS failed %d"), res);
+        Log.error(TAG_HASP, F("Closing test.json on FS failed %d"), res);
         /******* File System Test ********************************************************************/
 
         /* ********** Font Initializations ********** */
@@ -501,7 +501,7 @@ void haspSetup()
     }
 
     if(th) {
-        Log.verbose(TAG_HASP, F("Custom theme loaded"));
+        Log.trace(TAG_HASP, F("Custom theme loaded"));
     } else {
         Log.error(TAG_HASP, F("No theme could be loaded"));
     }
@@ -646,7 +646,7 @@ void IRAM_ATTR btn_event_handler(lv_obj_t * obj, lv_event_t event)
             return;
 
         case LV_EVENT_DELETE:
-            Log.warning(TAG_HASP, F("Object deleted Event %d occured"), event);
+            Log.verbose(TAG_HASP, F("Object deleted Event %d occured"), event);
             return;
         default:
             Log.warning(TAG_HASP, F("Unknown Event %d occured"), event);
@@ -802,7 +802,7 @@ void haspNewObject(const JsonObject & config, uint8_t & saved_page_id)
             Log.warning(TAG_HASP, F("Parent ID p[%u].b[%u] not found"), pageid, parentid);
             parent_obj = page; // create on the page instead ??
         } else {
-            Log.trace(TAG_HASP, F("Parent ID p[%u].b[%u] found"), pageid, parentid);
+            Log.verbose(TAG_HASP, F("Parent ID p[%u].b[%u] found"), pageid, parentid);
         }
     }
 
@@ -890,6 +890,7 @@ void haspNewObject(const JsonObject & config, uint8_t & saved_page_id)
             lv_obj_set_event_cb(obj, cpicker_event_handler);
             break;
         }
+
 #if LV_USE_PRELOAD != 0
         case LV_HASP_PRELOADER: {
             obj = lv_spinner_create(parent_obj, NULL);
@@ -923,6 +924,23 @@ void haspNewObject(const JsonObject & config, uint8_t & saved_page_id)
             lv_obj_set_event_cb(obj, btn_event_handler);
             break;
         }
+        case LV_HASP_CHART: {
+            obj = lv_chart_create(parent_obj, NULL);
+            lv_chart_set_range(obj, 0, 100);
+            lv_obj_set_event_cb(obj, btn_event_handler);
+
+            lv_chart_add_series(obj, LV_COLOR_RED);
+            lv_chart_add_series(obj, LV_COLOR_GREEN);
+            lv_chart_add_series(obj, LV_COLOR_BLUE);
+
+            lv_chart_series_t * ser = lv_chart_get_series(obj, 2);
+            lv_chart_set_next(obj, ser, 10);
+            lv_chart_set_next(obj, ser, 20);
+            lv_chart_set_next(obj, ser, 30);
+            lv_chart_set_next(obj, ser, 40);
+
+            break;
+        }
 
         /* ----- On/Off Objects ------ */
         case LV_HASP_SWITCH: {
@@ -977,7 +995,7 @@ void haspNewObject(const JsonObject & config, uint8_t & saved_page_id)
     for(JsonPair keyValue : config) {
         v = keyValue.value().as<String>();
         hasp_process_obj_attribute(obj, keyValue.key().c_str(), v.c_str(), true);
-        // Log.trace(TAG_HASP,F("     * %s => %s"), keyValue.key().c_str(), v.c_str());
+        // Log.verbose(TAG_HASP,F("     * %s => %s"), keyValue.key().c_str(), v.c_str());
     }
 
     /** testing start **/
@@ -997,7 +1015,7 @@ void haspNewObject(const JsonObject & config, uint8_t & saved_page_id)
     if(test != obj) {
         Log.error(TAG_HASP, F("Objects DO NOT match!"));
     } else {
-        // Log.trace(TAG_HASP,F("Objects match!"));
+        // Log.verbose(TAG_HASP,F("Objects match!"));
     }
 }
 
@@ -1022,14 +1040,14 @@ void haspLoadPage(const char * pages)
     dispatchParseJsonl(file);
     file.close();
 
-    Log.notice(TAG_HASP, F("File %s loaded"), pages);
+    Log.trace(TAG_HASP, F("File %s loaded"), pages);
 #else
 
 #if HASP_USE_EEPROM > 0
     Log.notice(TAG_HASP, F("Loading jsonl from EEPROM..."));
     EepromStream eepromStream(4096, 1024);
     dispatchJsonl(eepromStream);
-    Log.notice(TAG_HASP, F("Loaded jsonl from EEPROM"));
+    Log.tr  (TAG_HASP, F("Loaded jsonl from EEPROM"));
 #endif
 
 #endif
@@ -1059,7 +1077,7 @@ bool haspGetConfig(const JsonObject & settings)
     if(strcmp(haspPagesPath, settings[FPSTR(F_CONFIG_PAGES)].as<String>().c_str()) != 0) changed = true;
     settings[FPSTR(F_CONFIG_PAGES)] = haspPagesPath;
 
-    if(changed) configOutput(settings);
+    if(changed) configOutput(settings,TAG_HASP);
     return changed;
 }
 
@@ -1073,7 +1091,7 @@ bool haspGetConfig(const JsonObject & settings)
  **/
 bool haspSetConfig(const JsonObject & settings)
 {
-    configOutput(settings);
+    configOutput(settings, TAG_HASP);
     bool changed = false;
 
     changed |= configSet(haspStartPage, settings[FPSTR(F_CONFIG_STARTPAGE)], F("haspStartPage"));
diff --git a/src/hasp_config.cpp b/src/hasp_config.cpp
index 1d554d21..a16abda0 100644
--- a/src/hasp_config.cpp
+++ b/src/hasp_config.cpp
@@ -26,7 +26,7 @@ void confDebugSet(const __FlashStringHelper * fstr_name)
     /*char buffer[128];
     snprintf(buffer, sizeof(buffer), PSTR("   * %s set"), name);
     debugPrintln(buffer);*/
-    Log.trace(TAG_CONF, F("   * %S set"), fstr_name);
+    Log.verbose(TAG_CONF, F("   * %S set"), fstr_name);
 }
 
 bool configSet(int8_t & value, const JsonVariant & setting, const __FlashStringHelper * fstr_name)
@@ -71,7 +71,7 @@ void configStartDebug(bool setupdebug, String & configFile)
     if(setupdebug) {
         debugStart(); // Debug started, now we can use it; HASP header sent
 #if HASP_USE_SPIFFS > 0 || HASP_USE_LITTLEFS > 0
-        Log.notice(TAG_CONF, F("[SUCCESS] SPI flash FS mounted"));
+        Log.trace(TAG_CONF, F("[SUCCESS] SPI flash FS mounted"));
         filesystemInfo();
         filesystemList();
 #endif
@@ -118,7 +118,7 @@ void configGetConfig(JsonDocument & settings, bool setupdebug = false)
             output.replace(settings[F("mqtt")][F("pass")].as<String>(), passmask);
             output.replace(settings[F("wifi")][F("pass")].as<String>(), passmask);
             Log.verbose(TAG_CONF, output.c_str());
-            Log.notice(TAG_CONF, F("[SUCCESS] Loaded %s"), configFile.c_str());
+            Log.trace(TAG_CONF, F("[SUCCESS] Loaded %s"), configFile.c_str());
 
             if(setupdebug) debugSetup();
             return;
@@ -168,7 +168,7 @@ void configBackupToEeprom()
         file.close();
         EEPROM.commit();
 
-        Log.verbose(TAG_CONF,F("Written %u to EEPROM"), index);
+        Log.trace(TAG_CONF,F("Written %u to EEPROM"), index);
     }
 #endif
 }
@@ -199,64 +199,79 @@ void configWriteConfig()
 
     bool writefile = false;
     bool changed   = false;
+    const __FlashStringHelper * module;
 
 #if HASP_USE_WIFI > 0
-    if(settings[F("wifi")].as<JsonObject>().isNull()) settings.createNestedObject(F("wifi"));
-    changed = wifiGetConfig(settings[F("wifi")]);
+    module = F("wifi");
+    if(settings[module].as<JsonObject>().isNull()) settings.createNestedObject(module);
+    changed = wifiGetConfig(settings[module]);
     if(changed) {
         Log.verbose(TAG_WIFI, settingsChanged.c_str());
+        configOutput(settings[module], TAG_WIFI);
         writefile = true;
     }
 #endif
+
 #if HASP_USE_MQTT > 0
-    if(settings[F("mqtt")].as<JsonObject>().isNull()) settings.createNestedObject(F("mqtt"));
-    changed = mqttGetConfig(settings[F("mqtt")]);
+    module = F("mqtt");
+    if(settings[module].as<JsonObject>().isNull()) settings.createNestedObject(module);
+    changed = mqttGetConfig(settings[module]);
     if(changed) {
         Log.verbose(TAG_MQTT, settingsChanged.c_str());
-        configOutput(settings[F("mqtt")]);
+        configOutput(settings[module], TAG_MQTT);
         writefile = true;
     }
 #endif
+
 #if HASP_USE_TELNET > 0
-    if(settings[F("telnet")].as<JsonObject>().isNull()) settings.createNestedObject(F("telnet"));
-    changed = telnetGetConfig(settings[F("telnet")]);
+    module = F("telnet");
+    if(settings[module].as<JsonObject>().isNull()) settings.createNestedObject(module);
+    changed = telnetGetConfig(settings[module]);
     if(changed) {
         Log.verbose(TAG_TELN, settingsChanged.c_str());
-        configOutput(settings[F("telnet")]);
+        configOutput(settings[module], TAG_TELN);
         writefile = true;
     }
 #endif
+
 #if HASP_USE_MDNS > 0
-    if(settings[F("mdns")].as<JsonObject>().isNull()) settings.createNestedObject(F("mdns"));
-    changed = mdnsGetConfig(settings[F("mdns")]);
+    module = F("mdns");
+    if(settings[module].as<JsonObject>().isNull()) settings.createNestedObject(module);
+    changed = mdnsGetConfig(settings[module]);
     if(changed) {
         Log.verbose(TAG_MDNS, settingsChanged.c_str());
+        configOutput(settings[module], TAG_MDNS);
         writefile = true;
     }
 #endif
+
 #if HASP_USE_HTTP > 0
     if(settings[F("http")].as<JsonObject>().isNull()) settings.createNestedObject(F("http"));
     changed = httpGetConfig(settings[F("http")]);
     if(changed) {
         Log.verbose(TAG_HTTP, settingsChanged.c_str());
-        configOutput(settings[F("http")]);
-        writefile = true;
-    }
-#endif
-#if HASP_USE_GPIO > 0
-    if(settings[F("gpio")].as<JsonObject>().isNull()) settings.createNestedObject(F("gpio"));
-    changed = gpioGetConfig(settings[F("gpio")]);
-    if(changed) {
-        Log.verbose(TAG_GPIO, settingsChanged.c_str());
-        configOutput(settings[F("gpio")]);
+        configOutput(settings[F("http")], TAG_HTTP);
         writefile = true;
     }
 #endif
 
-    if(settings[F("debug")].as<JsonObject>().isNull()) settings.createNestedObject(F("debug"));
-    changed = debugGetConfig(settings[F("debug")]);
+#if HASP_USE_GPIO > 0
+    module = F("gpio");
+    if(settings[module].as<JsonObject>().isNull()) settings.createNestedObject(module);
+    changed = gpioGetConfig(settings[module]);
+    if(changed) {
+        Log.verbose(TAG_GPIO, settingsChanged.c_str());
+        configOutput(settings[module], TAG_GPIO);
+        writefile = true;
+    }
+#endif
+
+    module = F("debug");
+    if(settings[module].as<JsonObject>().isNull()) settings.createNestedObject(module);
+    changed = debugGetConfig(settings[module]);
     if(changed) {
         Log.verbose(TAG_DEBG, settingsChanged.c_str());
+        configOutput(settings[module], TAG_DEBG);
         writefile = true;
     }
 
@@ -264,6 +279,7 @@ void configWriteConfig()
     changed = guiGetConfig(settings[F("gui")]);
     if(changed) {
         Log.verbose(TAG_GUI, settingsChanged.c_str());
+        configOutput(settings[F("gui")], TAG_GUI);
         writefile = true;
     }
 
@@ -271,6 +287,7 @@ void configWriteConfig()
     changed = haspGetConfig(settings[F("hasp")]);
     if(changed) {
         Log.verbose(TAG_HASP, settingsChanged.c_str());
+        configOutput(settings[F("hasp")], TAG_HASP);
         writefile = true;
     }
 
@@ -284,7 +301,7 @@ void configWriteConfig()
             size_t size = serializeJson(doc, file);
             file.close();
             if(size > 0) {
-                Log.verbose(TAG_CONF, F("[SUCCESS] Saved %s"), configFile.c_str());
+                Log.trace(TAG_CONF, F("[SUCCESS] Saved %s"), configFile.c_str());
                 // configBackupToEeprom();
             } else {
                 Log.error(TAG_CONF, F("Failed to write %s"), configFile.c_str());
@@ -295,7 +312,7 @@ void configWriteConfig()
 #endif
 
         // Method 1
-        // Log.verbose(TAG_CONF,F("Writing to EEPROM"));
+        // Log.trace(TAG_CONF,F("Writing to EEPROM"));
         // EepromStream eepromStream(0, 1024);
         // WriteBufferingStream bufferedWifiClient{eepromStream, 512};
         // serializeJson(doc, bufferedWifiClient);
@@ -304,7 +321,7 @@ void configWriteConfig()
 
 #if defined(STM32F4xx)
         // Method 2
-        Log.verbose(TAG_CONF, F("Writing to EEPROM"));
+        Log.trace(TAG_CONF, F("Writing to EEPROM"));
         char buffer[1024 + 128];
         size_t size = serializeJson(doc, buffer, sizeof(buffer));
         if(size > 0) {
@@ -312,16 +329,16 @@ void configWriteConfig()
             for(i = 0; i < size; i++) eeprom_buffered_write_byte(i, buffer[i]);
             eeprom_buffered_write_byte(i, 0);
             eeprom_buffer_flush();
-            Log.verbose(TAG_CONF, F("[SUCCESS] Saved EEPROM"));
+            Log.trace(TAG_CONF, F("[SUCCESS] Saved EEPROM"));
         } else {
             Log.error(TAG_CONF, F("Failed to save config to EEPROM"));
         }
 #endif
 
     } else {
-        Log.notice(TAG_CONF, F("Configuration did not change"));
+        Log.trace(TAG_CONF, F("Configuration did not change"));
     }
-    configOutput(settings);
+    configOutput(settings, TAG_CONF);
 }
 
 void configSetup()
@@ -350,45 +367,50 @@ void configSetup()
         }
 
         //#if HASP_USE_SPIFFS > 0
-        Log.verbose(TAG_CONF, F("Loading debug settings"));
+        Log.notice(TAG_DEBG, F("Loading debug settings"));
         debugSetConfig(settings[F("debug")]);
-        Log.verbose(TAG_CONF, F("Loading GUI settings"));
+        Log.notice(TAG_GPIO, F("Loading GUI settings"));
         guiSetConfig(settings[F("gui")]);
-        Log.verbose(TAG_CONF, F("Loading HASP settings"));
+        Log.notice(TAG_HASP, F("Loading HASP settings"));
         haspSetConfig(settings[F("hasp")]);
         // otaGetConfig(settings[F("ota")]);
 
 #if HASP_USE_WIFI > 0
-        Log.verbose(TAG_CONF, F("Loading WiFi settings"));
+        Log.trace(TAG_WIFI, F("Loading WiFi settings"));
         wifiSetConfig(settings[F("wifi")]);
 #endif
+
 #if HASP_USE_MQTT > 0
-        Log.verbose(TAG_CONF, F("Loading MQTT settings"));
+        Log.trace(TAG_MQTT, F("Loading MQTT settings"));
         mqttSetConfig(settings[F("mqtt")]);
 #endif
+
 #if HASP_USE_TELNET > 0
-        Log.verbose(TAG_CONF, F("Loading Telnet settings"));
+        Log.trace(TAG_TELN, F("Loading Telnet settings"));
         telnetSetConfig(settings[F("telnet")]);
 #endif
+
 #if HASP_USE_MDNS > 0
-        Log.verbose(TAG_CONF, F("Loading MDNS settings"));
+        Log.trace(TAG_MDNS, F("Loading MDNS settings"));
         mdnsSetConfig(settings[F("mdns")]);
 #endif
+
 #if HASP_USE_HTTP > 0
-        Log.verbose(TAG_CONF, F("Loading HTTP settings"));
+        Log.trace(TAG_HTTP, F("Loading HTTP settings"));
         httpSetConfig(settings[F("http")]);
 #endif
+
 #if HASP_USE_GPIO > 0
-        Log.verbose(TAG_CONF, F("Loading GPIO settings"));
+        Log.trace(TAG_GPIO, F("Loading GPIO settings"));
         gpioSetConfig(settings[F("gpio")]);
 #endif
-        //        }
-        Log.notice(TAG_CONF, F("User configuration loaded"));
+
+        Log.trace(TAG_CONF, F("User configuration loaded"));
     }
     //#endif
 }
 
-void configOutput(const JsonObject & settings)
+void configOutput(const JsonObject & settings, uint8_t tag)
 {
     String output((char *)0);
     output.reserve(128);
@@ -430,13 +452,13 @@ void configOutput(const JsonObject & settings)
         output.replace(password, passmask);
     }
 
-    Log.trace(TAG_CONF, output.c_str());
+    Log.verbose(tag, output.c_str());
 }
 
 bool configClear()
 {
 #if defined(STM32F4xx)
-    Log.verbose(TAG_CONF, F("Clearing EEPROM"));
+    Log.notice(TAG_CONF, F("Clearing EEPROM"));
     char buffer[1024 + 128];
     memset(buffer, 1, sizeof(buffer));
     if(sizeof(buffer) > 0) {
@@ -444,7 +466,7 @@ bool configClear()
         for(i = 0; i < sizeof(buffer); i++) eeprom_buffered_write_byte(i, buffer[i]);
         eeprom_buffered_write_byte(i, 0);
         eeprom_buffer_flush();
-        Log.verbose(TAG_CONF, F("[SUCCESS] Cleared EEPROM"));
+        Log.trace(TAG_CONF, F("[SUCCESS] Cleared EEPROM"));
         return true;
     } else {
         Log.error(TAG_CONF, F("Failed to clear to EEPROM"));
diff --git a/src/hasp_config.h b/src/hasp_config.h
index c199e512..9924cc34 100644
--- a/src/hasp_config.h
+++ b/src/hasp_config.h
@@ -2,6 +2,7 @@
 #define HASP_CONFIG_H
 
 #include "ArduinoJson.h"
+#include "hasp_debug.h" // for TAG_CONF
 
 /* json keys used in the configfile */
 const char F_CONFIG_STARTPAGE[] PROGMEM = "startpage";
@@ -39,7 +40,7 @@ void configStop(void);
 void configSetConfig(JsonObject & settings);
 void configGetConfig(JsonDocument & settings);
 void configWriteConfig();
-void configOutput(const JsonObject & settings);
+void configOutput(const JsonObject & settings, uint8_t tag = TAG_CONF);
 
 bool configSet(int8_t & value, const JsonVariant & setting, const __FlashStringHelper * fstr_name);
 bool configSet(uint8_t & value, const JsonVariant & setting, const __FlashStringHelper * fstr_name);
diff --git a/src/hasp_debug.cpp b/src/hasp_debug.cpp
index c4e5ea7f..1ade98cf 100644
--- a/src/hasp_debug.cpp
+++ b/src/hasp_debug.cpp
@@ -178,7 +178,7 @@ bool debugGetConfig(const JsonObject & settings)
     settings[FPSTR(F_CONFIG_LOG)] = debugSyslogFacility;
 #endif
 
-    if(changed) configOutput(settings);
+    if(changed) configOutput(settings, TAG_DEBG);
     return changed;
 }
 
@@ -192,7 +192,7 @@ bool debugGetConfig(const JsonObject & settings)
  **/
 bool debugSetConfig(const JsonObject & settings)
 {
-    configOutput(settings);
+    configOutput(settings, TAG_DEBG);
     bool changed = false;
 
     /* Serial Settings*/
@@ -299,12 +299,12 @@ static void debugPrintPriority(int level, Print * _logOutput)
         case LOG_LEVEL_NOTICE:
             debugSendAnsiCode(F(TERM_COLOR_WHITE), _logOutput);
             break;
-        case LOG_LEVEL_VERBOSE:
-            debugSendAnsiCode(F(TERM_COLOR_CYAN), _logOutput);
-            break;
         case LOG_LEVEL_TRACE:
             debugSendAnsiCode(F(TERM_COLOR_GRAY), _logOutput);
             break;
+        case LOG_LEVEL_VERBOSE:
+            debugSendAnsiCode(F(TERM_COLOR_CYAN), _logOutput);
+            break;
         default:
             debugSendAnsiCode(F(TERM_COLOR_RESET), _logOutput);
     }
@@ -525,7 +525,7 @@ void debugLvgl(lv_log_level_t level, const char * file, uint32_t line, const cha
     if(line != lastDbgLine || mem_mon.free_biggest_size != lastDbgFree) {
         switch(level) {
             case LV_LOG_LEVEL_TRACE:
-                Log.trace(TAG_LVGL, descr);
+                Log.verbose(TAG_LVGL, descr);
                 break;
             case LV_LOG_LEVEL_WARN:
                 Log.warning(TAG_LVGL, descr);
diff --git a/src/hasp_dispatch.cpp b/src/hasp_dispatch.cpp
index 50f77695..cacaf46c 100644
--- a/src/hasp_dispatch.cpp
+++ b/src/hasp_dispatch.cpp
@@ -13,7 +13,7 @@
 #include "hasp_hal.h"
 #include "hasp.h"
 
- bool is_true(const char * s)
+bool is_true(const char * s)
 {
     return (!strcasecmp_P(s, PSTR("true")) || !strcasecmp_P(s, PSTR("on")) || !strcasecmp_P(s, PSTR("yes")) ||
             !strcmp_P(s, PSTR("1")));
@@ -122,7 +122,7 @@ void dispatchParseJsonl(char * payload)
 // p[x].b[y]=value
 inline void dispatch_process_button_attribute(String strTopic, const char * payload)
 {
-    // Log.trace(TAG_MSGR,F("BTN ATTR: %s = %s"), strTopic.c_str(), payload);
+    // Log.verbose(TAG_MSGR,F("BTN ATTR: %s = %s"), strTopic.c_str(), payload);
 
     String strPageId((char *)0);
     String strTemp((char *)0);
@@ -193,7 +193,7 @@ void dispatchCommand(const char * topic, const char * payload)
         haspWakeUp();
 
     } else if(strcasecmp_P(topic, PSTR("screenshot")) == 0) {
-        guiTakeScreenshot("/screenhot.bmp");
+        guiTakeScreenshot("/screenshot.bmp"); // Literal String
 
     } else if(strcasecmp_P(topic, PSTR("")) == 0 || strcasecmp_P(topic, PSTR("statusupdate")) == 0) {
         dispatch_output_statusupdate();
@@ -330,7 +330,7 @@ void dispatchBacklight(const char * payload)
 // Strip command/config prefix from the topic and process the payload
 void dispatchTopicPayload(const char * topic, const char * payload)
 {
-    // Log.trace(TAG_MSGR,F("TOPIC: short topic: %s"), topic);
+    // Log.verbose(TAG_MSGR,F("TOPIC: short topic: %s"), topic);
 
     if(!strcmp_P(topic, PSTR("command"))) {
         dispatchTextLine((char *)payload);
@@ -339,7 +339,7 @@ void dispatchTopicPayload(const char * topic, const char * payload)
 
     if(topic == strstr_P(topic, PSTR("command/"))) { // startsWith command/
         topic += 8u;
-        // Log.trace(TAG_MSGR,F("MQTT IN: command subtopic: %s"), topic);
+        // Log.verbose(TAG_MSGR,F("MQTT IN: command subtopic: %s"), topic);
 
         // '[...]/device/command/p[1].b[4].txt' -m '"Lights On"' ==
         // nextionSetAttr("p[1].b[4].txt", "\"Lights On\"")
@@ -432,7 +432,7 @@ void dispatchReboot(bool saveConfig)
     wifiStop();
 #endif
     Log.verbose(TAG_MSGR, F("-------------------------------------"));
-    Log.notice(TAG_MSGR, F("STOP: Properly Rebooting the MCU now!"));
+    Log.notice(TAG_MSGR, F("HALT: Properly Rebooting the MCU now!"));
     Serial.flush();
     halRestart();
 }
@@ -553,7 +553,7 @@ void dispatch_send_object_event(uint8_t pageid, uint8_t objid, uint8_t eventid)
 void dispatchWebUpdate(const char * espOtaUrl)
 {
 #if HASP_USE_OTA > 0
-    Log.verbose(TAG_MSGR, F("Checking for updates at URL: %s"), espOtaUrl);
+    Log.notice(TAG_MSGR, F("Checking for updates at URL: %s"), espOtaUrl);
     otaHttpUpdate(espOtaUrl);
 #endif
 }
diff --git a/src/hasp_filesystem.cpp b/src/hasp_filesystem.cpp
index 5ae50f39..ab6e3e5e 100644
--- a/src/hasp_filesystem.cpp
+++ b/src/hasp_filesystem.cpp
@@ -85,7 +85,7 @@ void filesystemList()
 #if defined(ARDUINO_ARCH_ESP8266)
         Dir dir = SPIFFS.openDir("/");
         while(dir.next()) {
-            Log.notice(TAG_FILE, F("   * %s  (%u bytes)"), dir.fileName().c_str(), (uint32_t)dir.fileSize());
+            Log.verbose(TAG_FILE, F("   * %s  (%u bytes)"), dir.fileName().c_str(), (uint32_t)dir.fileSize());
         }
 #endif
     }
@@ -105,7 +105,7 @@ bool filesystemSetup()
         Log.error(TAG_FILE, F("SPI flash init failed. Unable to mount FS."));
         return false;
     } else {
-        Log.verbose(TAG_FILE, F("SPI Flash FS mounted"));
+        Log.trace(TAG_FILE, F("SPI Flash FS mounted"));
         return true;
     }
 #endif
diff --git a/src/hasp_gpio.cpp b/src/hasp_gpio.cpp
index cd96e50c..4163549f 100644
--- a/src/hasp_gpio.cpp
+++ b/src/hasp_gpio.cpp
@@ -131,7 +131,7 @@ void gpioAddButton(uint8_t pin, uint8_t input_mode, uint8_t default_state, uint8
                 buttonConfig->clearFeature(
                     ButtonConfig::kFeatureSuppressClickBeforeDoubleClick); // Causes annoying pauses
 
-                Log.verbose(TAG_GPIO,F("Button%d created on pin %d (index %d) mode %d default %d"), i, pin, index,
+                Log.trace(TAG_GPIO,F("Button%d created on pin %d (index %d) mode %d default %d"), i, pin, index,
                             input_mode, default_state);
                 gpioUsedInputCount = i + 1;
                 return;
@@ -162,7 +162,7 @@ void gpioAddTouchButton(uint8_t pin, uint8_t input_mode, uint8_t default_state,
                 buttonConfig->clearFeature(
                     ButtonConfig::kFeatureSuppressClickBeforeDoubleClick); // Causes annoying pauses
 
-                Log.verbose(TAG_GPIO,F("Button%d created on pin %d (index %d) mode %d default %d"), i, pin, index,
+                Log.trace(TAG_GPIO,F("Button%d created on pin %d (index %d) mode %d default %d"), i, pin, index,
                             input_mode, default_state);
                 gpioUsedInputCount = i + 1;
                 return;
@@ -573,7 +573,7 @@ bool gpioGetConfig(const JsonObject & settings)
         if(i < HASP_NUM_GPIO_CONFIG) {
             uint32_t cur_val = gpioConfig[i].pin | (gpioConfig[i].group << 8) | (gpioConfig[i].type << 16) |
                                (gpioConfig[i].gpio_function << 24);
-            Log.verbose(TAG_GPIO,F("GPIO CONF: %d: %d <=> %d"), i, cur_val, v.as<uint32_t>());
+            Log.trace(TAG_GPIO,F("GPIO CONF: %d: %d <=> %d"), i, cur_val, v.as<uint32_t>());
 
             if(cur_val != v.as<uint32_t>()) changed = true;
             v.set(cur_val);
diff --git a/src/hasp_gui.cpp b/src/hasp_gui.cpp
index 5b894cfb..ae8a20e2 100644
--- a/src/hasp_gui.cpp
+++ b/src/hasp_gui.cpp
@@ -217,7 +217,7 @@ static void ICACHE_RAM_ATTR lv_tick_handler(void)
 //     data->point.x = touchX; // 20 + (disp->driver.hor_res - 40) * (touchCorner % 2);
 //     data->point.y = touchY; // 20 + (disp->driver.ver_res - 40) * (touchCorner / 2);
 
-//     Log.trace(TAG_GUI,F("Calibrate touch %u / %u"), touchX, touchY);
+//     Log.verbose(TAG_GUI,F("Calibrate touch %u / %u"), touchX, touchY);
 
 // #endif
 
@@ -295,9 +295,9 @@ void handleTouch(int8_t contacts, GTPoint * points)
     GT911_num_touches = contacts;
     GT911_points      = points;
 
-    Log.trace(TAG_GUI, "Contacts: %d", contacts);
+    Log.verbose(TAG_GUI, "Contacts: %d", contacts);
     for(uint8_t i = 0; i < contacts; i++) {
-        Log.trace(TAG_GUI, "C%d: #%d %d,%d s:%d", i, points[i].trackId, points[i].x, points[i].y, points[i].area);
+        Log.verbose(TAG_GUI, "C%d: #%d %d,%d s:%d", i, points[i].trackId, points[i].x, points[i].y, points[i].area);
         yield();
     }
 }
@@ -372,13 +372,13 @@ void GT911_setup()
 
     touch.setHandler(handleTouch);
     touchStart();
-    Log.verbose(TAG_GUI, F("Goodix GT911x touch driver started"));
+    Log.trace(TAG_GUI, F("Goodix GT911x touch driver started"));
 }
 #endif
 
 bool IRAM_ATTR my_touchpad_read(lv_indev_drv_t * indev_driver, lv_indev_data_t * data)
 {
-    //#ifdef TOUCH_CS
+#ifdef TOUCH_CS
     uint16_t touchX, touchY;
     bool touched;
 #if TOUCH_DRIVER == 0
@@ -411,12 +411,12 @@ bool IRAM_ATTR my_touchpad_read(lv_indev_drv_t * indev_driver, lv_indev_data_t *
         data->point.x = touchX;
         data->point.y = touchY;
     }
-    /* Serial.print("Data x");
-       Serial.println(touchX);
-       Serial.print("Data y");
-       Serial.println(touchY);*/
-    //}
-    //#endif
+/* Serial.print("Data x");
+   Serial.println(touchX);
+   Serial.print("Data y");
+   Serial.println(touchY);*/
+//}
+#endif
 
     return false; /*Return `false` because we are not buffering and no more data to read*/
 }
@@ -424,7 +424,9 @@ bool IRAM_ATTR my_touchpad_read(lv_indev_drv_t * indev_driver, lv_indev_data_t *
 void guiCalibrate()
 {
 #if TOUCH_DRIVER == 0 && USE_TFT_ESPI > 0
+#ifdef TOUCH_CS
     tft_espi_calibrate(calData);
+#endif
 
     for(uint8_t i = 0; i < 5; i++) {
         Serial.print(calData[i]);
@@ -472,13 +474,23 @@ void guiSetup()
 
 #if defined(ARDUINO_ARCH_ESP32)
     /* allocate on iram (or psram ?) */
-    guiVDBsize = 16 * 1024u; // 32 KBytes * 2
     static lv_disp_buf_t disp_buf;
-    static lv_color_t * guiVdbBuffer1 =
-        (lv_color_t *)heap_caps_malloc(sizeof(lv_color_t) * guiVDBsize, MALLOC_CAP_8BIT);
+
+#ifdef USE_DMA_TO_TFT
+    static lv_color_t *guiVdbBuffer1, *guiVdbBuffer2 = NULL;
+    guiVDBsize    = 4 * 1024u; // 16 KBytes * 2
+    guiVdbBuffer1 = (lv_color_t *)heap_caps_malloc(sizeof(lv_color_t) * guiVDBsize, MALLOC_CAP_DMA);
+    guiVdbBuffer2 = (lv_color_t *)heap_caps_malloc(sizeof(lv_color_t) * guiVDBsize, MALLOC_CAP_DMA);
+    lv_disp_buf_init(&disp_buf, guiVdbBuffer1, guiVdbBuffer2, guiVDBsize);
+#else
+    static lv_color_t * guiVdbBuffer1;
+    guiVDBsize    = 16 * 1024u; // 32 KBytes * 2
+    guiVdbBuffer1 = (lv_color_t *)heap_caps_malloc(sizeof(lv_color_t) * guiVDBsize, MALLOC_CAP_8BIT);
+    lv_disp_buf_init(&disp_buf, guiVdbBuffer1, NULL, guiVDBsize);
+#endif
+
     // static lv_color_t * guiVdbBuffer2 = (lv_color_t *)malloc(sizeof(lv_color_t) * guiVDBsize);
     // lv_disp_buf_init(&disp_buf, guiVdbBuffer1, guiVdbBuffer2, guiVDBsize);
-    lv_disp_buf_init(&disp_buf, guiVdbBuffer1, NULL, guiVDBsize);
 #elif defined(ARDUINO_ARCH_ESP8266)
     /* allocate on heap */
     static lv_disp_buf_t disp_buf;
@@ -541,7 +553,7 @@ void guiSetup()
     Log.verbose(TAG_LVGL, F("VFB size : %d"), (size_t)sizeof(lv_color_t) * guiVDBsize);
 
 #if LV_USE_LOG != 0
-    Log.verbose(TAG_LVGL, F("Registering lvgl logging handler"));
+    Log.notice(TAG_LVGL, F("Registering lvgl logging handler"));
     lv_log_register_print_cb(debugLvgl); /* register print function for debugging */
 #endif
 
@@ -598,7 +610,7 @@ void guiSetup()
         // lv_label_set_text(label, "<");
         // lv_indev_set_cursor(mouse_indev, label); // connect the object to the driver
 
-        Log.verbose(TAG_GUI, F("Initialize Cursor"));
+        Log.notice(TAG_GUI, F("Initialize Cursor"));
         lv_obj_t * cursor;
         lv_obj_t * mouse_layer = lv_disp_get_layer_sys(NULL); // default display
 
@@ -732,7 +744,7 @@ bool guiGetConfig(const JsonObject & settings)
         } else {
             changed = true;
 
-#if TOUCH_DRIVER == 0 && USE_TFT_ESPI > 0
+#if TOUCH_DRIVER == 0 && USE_TFT_ESPI > 0 && defined(TOUCH_CS)
             tft_espi_set_touch(calData);
 #endif
         }
@@ -747,12 +759,12 @@ bool guiGetConfig(const JsonObject & settings)
         }
         changed = true;
 
-#if TOUCH_DRIVER == 0 && USE_TFT_ESPI > 0
+#if TOUCH_DRIVER == 0 && USE_TFT_ESPI > 0 && defined(TOUCH_CS)
         tft_espi_set_touch(calData);
 #endif
     }
 
-    if(changed) configOutput(settings);
+    if(changed) configOutput(settings, TAG_GUI);
     return changed;
 }
 
@@ -766,7 +778,7 @@ bool guiGetConfig(const JsonObject & settings)
  **/
 bool guiSetConfig(const JsonObject & settings)
 {
-    configOutput(settings);
+    configOutput(settings, TAG_GUI);
     bool changed = false;
 
     changed |= configSet(guiTickPeriod, settings[FPSTR(F_GUI_TICKPERIOD)], F("guiTickPeriod"));
@@ -777,7 +789,7 @@ bool guiSetConfig(const JsonObject & settings)
 
     if(!settings[FPSTR(F_GUI_POINTER)].isNull()) {
         if(guiShowPointer != settings[FPSTR(F_GUI_POINTER)].as<bool>()) {
-            Log.trace(TAG_GUI, F("guiShowPointer set"));
+            Log.verbose(TAG_GUI, F("guiShowPointer set"));
         }
         changed |= guiShowPointer != settings[FPSTR(F_GUI_POINTER)].as<bool>();
 
@@ -798,7 +810,7 @@ bool guiSetConfig(const JsonObject & settings)
         }
 
         if(calData[0] != 0 || calData[1] != 65535 || calData[2] != 0 || calData[3] != 65535) {
-            Log.trace(TAG_GUI, F("calData set [%u, %u, %u, %u, %u]"), calData[0], calData[1], calData[2], calData[3],
+            Log.verbose(TAG_GUI, F("calData set [%u, %u, %u, %u, %u]"), calData[0], calData[1], calData[2], calData[3],
                       calData[4]);
             oobeSetAutoCalibrate(false);
         } else {
@@ -806,7 +818,7 @@ bool guiSetConfig(const JsonObject & settings)
             oobeSetAutoCalibrate(true);
         }
 
-#if TOUCH_DRIVER == 0 && USE_TFT_ESPI > 0
+#if TOUCH_DRIVER == 0 && USE_TFT_ESPI > 0 && defined(TOUCH_CS)
         if(status) tft_espi_set_touch(calData);
 #endif
         changed |= status;
@@ -879,7 +891,7 @@ static void gui_get_bitmap_header(uint8_t * buffer, size_t bufsize)
 
 void gui_flush_not_complete()
 {
-    Log.warning(TAG_GUI, F("GUI: Pixelbuffer not completely sent"));
+    Log.warning(TAG_GUI, F("Pixelbuffer not completely sent"));
 }
 #endif // HASP_USE_SPIFFS > 0 || HASP_USE_LITTLEFS > 0 || HASP_USE_HTTP > 0
 
@@ -913,7 +925,7 @@ void guiTakeScreenshot(const char * pFileName)
 
         size_t len = pFileOut.write(buffer, 122);
         if(len == 122) {
-            Log.verbose(TAG_GUI, F("GUI: Bitmap header written"));
+            Log.verbose(TAG_GUI, F("Bitmap header written"));
 
             /* Refresh screen to screenshot callback */
             lv_disp_t * disp = lv_disp_get_default();
@@ -924,15 +936,15 @@ void guiTakeScreenshot(const char * pFileName)
             lv_refr_now(NULL);                /* Will call our disp_drv.disp_flush function */
             disp->driver.flush_cb = flush_cb; /* restore callback */
 
-            Log.verbose(TAG_GUI, F("GUI: Bitmap data flushed to %s"), pFileName);
+            Log.verbose(TAG_GUI, F("Bitmap data flushed to %s"), pFileName);
 
         } else {
-            Log.error(TAG_GUI, F("GUI: Data written does not match header size"));
+            Log.error(TAG_GUI, F("Data written does not match header size"));
         }
         pFileOut.close();
 
     } else {
-        Log.warning(TAG_GUI, F("GUI: %s cannot be opened"), pFileName);
+        Log.warning(TAG_GUI, F("%s cannot be opened"), pFileName);
     }
 }
 #endif
@@ -961,7 +973,7 @@ void guiTakeScreenshot()
     gui_get_bitmap_header(buffer, sizeof(buffer));
 
     if(httpClientWrite(buffer, 122) == 122) {
-        Log.verbose(TAG_GUI, F("GUI: Bitmap header sent"));
+        Log.verbose(TAG_GUI, F("Bitmap header sent"));
 
         /* Refresh screen to screenshot callback */
         lv_disp_t * disp = lv_disp_get_default();
@@ -972,9 +984,9 @@ void guiTakeScreenshot()
         lv_refr_now(NULL);                /* Will call our disp_drv.disp_flush function */
         disp->driver.flush_cb = flush_cb; /* restore callback */
 
-        Log.verbose(TAG_GUI, F("GUI: Bitmap data flushed to webclient"));
+        Log.verbose(TAG_GUI, F("Bitmap data flushed to webclient"));
     } else {
-        Log.error(TAG_GUI, F("GUI: Data sent does not match header size"));
+        Log.error(TAG_GUI, F("Data sent does not match header size"));
     }
 }
 #endif
\ No newline at end of file
diff --git a/src/hasp_http.cpp b/src/hasp_http.cpp
index 998d3b11..9e505c49 100644
--- a/src/hasp_http.cpp
+++ b/src/hasp_http.cpp
@@ -126,10 +126,10 @@ bool httpIsAuthenticated(const __FlashStringHelper * fstr_page)
     }
 
 #if defined(ARDUINO_ARCH_ESP32) || defined(ARDUINO_ARCH_ESP8266)
-    Log.verbose(TAG_HTTP, F("Sending %S page to client connected from: %s"), fstr_page,
+    Log.notice(TAG_HTTP, F("Sending %S page to client connected from: %s"), fstr_page,
                 webServer.client().remoteIP().toString().c_str());
 #else
-    // Log.verbose(TAG_HTTP,F("Sending %s page to client connected from: %s"), page,
+    // Log.trace(TAG_HTTP,F("Sending %s page to client connected from: %s"), page,
     //             String(webServer.client().remoteIP()).c_str());
 #endif
 
@@ -638,7 +638,7 @@ void webUpdatePrintError()
 
 void webUpdateReboot()
 {
-    Log.notice(TAG_HTTP, F("Update Success: %u bytes received. Rebooting..."), upload->totalSize);
+    Log.trace(TAG_HTTP, F("Update Success: %u bytes received. Rebooting..."), upload->totalSize);
 
     {
         String httpMessage((char *)0);
@@ -724,7 +724,7 @@ void handleFileUpload()
     upload = &webServer.upload();
     if(upload->status == UPLOAD_FILE_START) {
         if(!httpIsAuthenticated(F("fileupload"))) return;
-        Log.verbose(TAG_HTTP, F("Total size: %s"), webServer.headerName(0).c_str());
+        Log.trace(TAG_HTTP, F("Total size: %s"), webServer.headerName(0).c_str());
         String filename((char *)0);
         filename.reserve(128);
         filename = upload->filename;
@@ -750,7 +750,7 @@ void handleFileUpload()
         }
     } else if(upload->status == UPLOAD_FILE_END) {
         if(fsUploadFile) {
-            Log.verbose(TAG_HTTP, F("Uploaded %s (%u bytes)"), fsUploadFile.name(), upload->totalSize);
+            Log.trace(TAG_HTTP, F("Uploaded %s (%u bytes)"), fsUploadFile.name(), upload->totalSize);
             fsUploadFile.close();
         }
         haspProgressVal(255);
@@ -773,7 +773,7 @@ void handleFileDelete()
         return webServer.send_P(500, mimetype, PSTR("BAD ARGS"));
     }
     String path = webServer.arg(0);
-    Log.verbose(TAG_HTTP, F("handleFileDelete: %s"), path.c_str());
+    Log.notice(TAG_HTTP, F("handleFileDelete: %s"), path.c_str());
     if(path == "/") {
         return webServer.send_P(500, mimetype, PSTR("BAD PATH"));
     }
@@ -793,7 +793,7 @@ void handleFileCreate()
         return webServer.send(500, PSTR("text/plain"), PSTR("BAD ARGS"));
     }
     String path = webServer.arg(0);
-    Log.verbose(TAG_HTTP, F("handleFileCreate: %s"), path.c_str());
+    Log.notice(TAG_HTTP, F("handleFileCreate: %s"), path.c_str());
     if(path == "/") {
         return webServer.send(500, PSTR("text/plain"), PSTR("BAD PATH"));
     }
@@ -820,7 +820,7 @@ void handleFileList()
     }
 
     String path = webServer.arg(F("dir"));
-    Log.verbose(TAG_HTTP, F("handleFileList: %s"), path.c_str());
+    Log.notice(TAG_HTTP, F("handleFileList: %s"), path.c_str());
     path.clear();
 
 #if defined(ARDUINO_ARCH_ESP32)
@@ -1682,9 +1682,9 @@ void webStart()
 #if defined(STM32F4xx)
     IPAddress ip;
     ip = WiFi.localIP();
-    Log.notice(TAG_HTTP, F("Server started @ http://%d.%d.%d.%d"), ip[0], ip[1], ip[2], ip[3]);
+    Log.trace(TAG_HTTP, F("Server started @ http://%d.%d.%d.%d"), ip[0], ip[1], ip[2], ip[3]);
 #else
-    Log.notice(TAG_HTTP, F("Server started @ http://%s"),
+    Log.trace(TAG_HTTP, F("Server started @ http://%s"),
                (WiFi.getMode() != WIFI_STA ? WiFi.softAPIP().toString().c_str() : WiFi.localIP().toString().c_str()));
 #endif
 #else
@@ -1694,7 +1694,7 @@ void webStart()
 #else
     ip = Ethernet.localIP();
 #endif
-    Log.notice(TAG_HTTP, F("Server started @ http://%d.%d.%d.%d"), ip[0], ip[1], ip[2], ip[3]);
+    Log.trace(TAG_HTTP, F("Server started @ http://%d.%d.%d.%d"), ip[0], ip[1], ip[2], ip[3]);
 #endif
 }
 
@@ -1813,7 +1813,7 @@ void httpSetup()
     size_t headerkeyssize     = sizeof(headerkeys) / sizeof(char *);
     webServer.collectHeaders(headerkeys, headerkeyssize);
 
-    Log.verbose(TAG_HTTP, F("Setup Complete"));
+    Log.trace(TAG_HTTP, F("Setup Complete"));
     webStart();
 }
 
@@ -1861,7 +1861,7 @@ bool httpGetConfig(const JsonObject & settings)
     if(strcmp(httpPassword, settings[FPSTR(F_CONFIG_PASS)].as<String>().c_str()) != 0) changed = true;
     settings[FPSTR(F_CONFIG_PASS)] = httpPassword;
 
-    if(changed) configOutput(settings);
+    if(changed) configOutput(settings, TAG_HTTP);
     return changed;
 }
 
@@ -1875,7 +1875,7 @@ bool httpGetConfig(const JsonObject & settings)
  **/
 bool httpSetConfig(const JsonObject & settings)
 {
-    configOutput(settings);
+    configOutput(settings, TAG_HTTP);
     bool changed = false;
 
     changed |= configSet(httpPort, settings[FPSTR(F_CONFIG_PORT)], F("httpPort"));
diff --git a/src/hasp_mdns.cpp b/src/hasp_mdns.cpp
index 60829b3b..9f9c3d2e 100644
--- a/src/hasp_mdns.cpp
+++ b/src/hasp_mdns.cpp
@@ -19,7 +19,7 @@ void mdnsSetup()
 {
     // mdnsSetConfig(settings);
     mdnsStart();
-    Log.verbose(TAG_MDNS, F("Setup Complete"));
+    Log.trace(TAG_MDNS, F("Setup Complete"));
 }
 
 void mdnsStart()
@@ -50,7 +50,7 @@ void mdnsStart()
                         addServiceTxt("arduino", "tcp", "ssh_upload", "no");
                         addServiceTxt("arduino", "tcp", "board", ARDUINO_BOARD);
                         addServiceTxt("arduino", "tcp", "auth_upload", (auth) ? "yes" : "no");*/
-            Log.notice(TAG_MDNS, F("Responder started"));
+            Log.trace(TAG_MDNS, F("Responder started"));
         } else {
             Log.error(TAG_MDNS, F("Responder failed to start %s"), hasp2Node.c_str());
         };
@@ -81,7 +81,7 @@ bool mdnsGetConfig(const JsonObject & settings)
     if(mdnsEnabled != settings[FPSTR(F_CONFIG_ENABLE)].as<bool>()) changed = true;
     settings[FPSTR(F_CONFIG_ENABLE)] = mdnsEnabled;
 
-    if(changed) configOutput(settings);
+    if(changed) configOutput(settings, TAG_MDNS);
     return changed;
 }
 
@@ -95,7 +95,7 @@ bool mdnsGetConfig(const JsonObject & settings)
  **/
 bool mdnsSetConfig(const JsonObject & settings)
 {
-    configOutput(settings);
+    configOutput(settings, TAG_MDNS);
     bool changed = false;
 
     changed |= configSet(mdnsEnabled, settings[FPSTR(F_CONFIG_ENABLE)], F("mdnsEnabled"));
diff --git a/src/hasp_mqtt.cpp b/src/hasp_mqtt.cpp
index f6298462..c79e81c1 100644
--- a/src/hasp_mqtt.cpp
+++ b/src/hasp_mqtt.cpp
@@ -149,7 +149,7 @@ void IRAM_ATTR mqtt_send_state(const __FlashStringHelper * subtopic, const char
 
 void mqtt_send_input(uint8_t id, const char * payload)
 {
-    // Log.trace(TAG_MQTT,F("TST: %sstate/input%u = %s"), mqttNodeTopic, id, payload); // to be removed
+    // Log.verbose(TAG_MQTT,F("TST: %sstate/input%u = %s"), mqttNodeTopic, id, payload); // to be removed
 
     if(mqttIsConnected()) {
         char topic[64];
@@ -355,7 +355,7 @@ void mqttReconnect()
         mac.toLowerCase();
         memset(mqttClientId, 0, sizeof(mqttClientId));
         snprintf_P(mqttClientId, sizeof(mqttClientId), PSTR("plate_%s"), mac.c_str());
-        Log.verbose(TAG_MQTT, mqttClientId);
+        Log.trace(TAG_MQTT, mqttClientId);
     }
 
     // Attempt to connect and set LWT and Clean Session
@@ -407,7 +407,7 @@ void mqttReconnect()
         return;
     }
 
-    Log.notice(TAG_MQTT, F("[SUCCESS] Connected to broker %s as clientID %s"), mqttServer, mqttClientId);
+    Log.trace(TAG_MQTT, F("[SUCCESS] Connected to broker %s as clientID %s"), mqttServer, mqttClientId);
 
     /*
         // MQTT topic string definitions
@@ -468,9 +468,9 @@ void mqttSetup()
     if(mqttEnabled) {
         mqttClient.setServer(mqttServer, 1883);
         mqttClient.setCallback(mqtt_message_cb);
-        Log.notice(TAG_MQTT, F("Setup Complete"));
+        Log.trace(TAG_MQTT, F("Setup Complete"));
     } else {
-        Log.notice(TAG_MQTT, F("Broker not configured"));
+        Log.warning(TAG_MQTT, F("Broker not configured"));
     }
 }
 
@@ -501,7 +501,7 @@ void mqttStop()
         mqttClient.publish(topicBuffer, "{\"status\": \"unavailable\"}");
 
         mqttClient.disconnect();
-        Log.notice(TAG_MQTT, F("Disconnected from broker"));
+        Log.trace(TAG_MQTT, F("Disconnected from broker"));
     }
 }
 
@@ -527,7 +527,7 @@ bool mqttGetConfig(const JsonObject & settings)
     if(strcmp(mqttPassword, settings[FPSTR(F_CONFIG_PASS)].as<String>().c_str()) != 0) changed = true;
     settings[FPSTR(F_CONFIG_PASS)] = mqttPassword;
 
-    if(changed) configOutput(settings);
+    if(changed) configOutput(settings, TAG_MQTT);
     return changed;
 }
 
@@ -541,7 +541,7 @@ bool mqttGetConfig(const JsonObject & settings)
  **/
 bool mqttSetConfig(const JsonObject & settings)
 {
-    configOutput(settings);
+    configOutput(settings, TAG_MQTT);
     bool changed = false;
 
     changed |= configSet(mqttPort, settings[FPSTR(F_CONFIG_PORT)], F("mqttPort"));
diff --git a/src/hasp_oobe.cpp b/src/hasp_oobe.cpp
index 00f25c65..aa9b9126 100644
--- a/src/hasp_oobe.cpp
+++ b/src/hasp_oobe.cpp
@@ -315,11 +315,11 @@ bool oobeSetup()
         if(oobeAutoCalibrate) {
             lv_obj_set_click(lv_disp_get_layer_sys(NULL), true);
             lv_obj_set_event_cb(lv_disp_get_layer_sys(NULL), oobe_calibrate_cb);
-            Log.verbose(TAG_OOBE,F("Enabled Auto Calibrate on touch"));
+            Log.trace(TAG_OOBE,F("Enabled Auto Calibrate on touch"));
         } else {
             lv_obj_set_click(lv_disp_get_layer_sys(NULL), false);
             lv_obj_set_event_cb(lv_disp_get_layer_sys(NULL), gotoPage1_cb);
-            Log.verbose(TAG_OOBE,F("Already calibrated"));
+            Log.trace(TAG_OOBE,F("Already calibrated"));
         }
         oobeSetPage(0);
         return true;
@@ -346,9 +346,9 @@ void oobeFakeSetup()
     if(oobeAutoCalibrate) {
         lv_obj_set_click(lv_disp_get_layer_sys(NULL), true);
         lv_obj_set_event_cb(lv_disp_get_layer_sys(NULL), oobe_calibrate_cb);
-        Log.verbose(TAG_OOBE,F("Enabled Auto Calibrate on touch"));
+        Log.trace(TAG_OOBE,F("Enabled Auto Calibrate on touch"));
     } else {
-        Log.verbose(TAG_OOBE,F("Already calibrated"));
+        Log.trace(TAG_OOBE,F("Already calibrated"));
     }
 #endif
 }
\ No newline at end of file
diff --git a/src/hasp_ota.cpp b/src/hasp_ota.cpp
index 3f10aff5..1fb19942 100644
--- a/src/hasp_ota.cpp
+++ b/src/hasp_ota.cpp
@@ -39,7 +39,7 @@ void otaProgress()
 void otaSetup()
 {
     if(strlen(otaUrl.c_str())) {
-        Log.verbose(TAG_OTA, otaUrl.c_str());
+        Log.trace(TAG_OTA, otaUrl.c_str());
     }
 
     if(otaPort > 0) {
@@ -49,15 +49,16 @@ void otaSetup()
                 // NOTE: if updating SPIFFS this would be the place to unmount SPIFFS using SPIFFS.end()
             }
 
-            Log.notice(TAG_OTA, F("Start update"));
+            Log.notice(TAG_OTA, F("Starting OTA update"));
             haspProgressVal(0);
             haspProgressMsg(F("Firmware Update"));
             otaPrecentageComplete = 0;
         });
         ArduinoOTA.onEnd([]() {
             otaPrecentageComplete = 100;
-            haspProgressMsg(F("Applying Firmware & Reboot"));
+            Log.notice(TAG_OTA, F("OTA update complete"));
             haspProgressVal(100);
+            haspProgressMsg(F("Applying Firmware & Reboot"));
             otaProgress();
             otaPrecentageComplete = -1;
             // setup();
@@ -117,9 +118,9 @@ void otaSetup()
         ArduinoOTA.setRebootOnSuccess(false); // We do that
 
         ArduinoOTA.begin();
-        Log.notice(TAG_OTA, F("Over the Air firmware update ready"));
+        Log.trace(TAG_OTA, F("Over the Air firmware update ready"));
     } else {
-        Log.notice(TAG_OTA, F("Disabled"));
+        Log.warning(TAG_OTA, F("Disabled"));
     }
 }
 
diff --git a/src/hasp_slave.cpp b/src/hasp_slave.cpp
index 17eabccc..c13ec6bd 100644
--- a/src/hasp_slave.cpp
+++ b/src/hasp_slave.cpp
@@ -57,7 +57,7 @@ void IRAM_ATTR slave_send_obj_attribute_str(uint8_t pageid, uint8_t btnid, const
 
 void slave_send_input(uint8_t id, const char * payload)
 {
-  // Log.trace(TAG_TASM,F("MQTT TST: %sstate/input%u = %s"), mqttNodeTopic, id, payload); // to be removed
+  // Log.verbose(TAG_TASM,F("MQTT TST: %sstate/input%u = %s"), mqttNodeTopic, id, payload); // to be removed
 
   char cBuffer[strlen(payload) + 64];
   memset(cBuffer, 0 ,sizeof(cBuffer));
@@ -90,12 +90,12 @@ void TASMO_TELE_JSON()
 
 void TASMO_DATA_RECEIVE(char *data)
 {
-  Log.verbose(TAG_TASM,F("Slave IN [%s]"), data);
+  Log.trace(TAG_TASM,F("Slave IN [%s]"), data);
 
   char dataType[3];
   memset(dataType, 0 ,sizeof(dataType));
   snprintf_P(dataType, sizeof(dataType), data);
-  Log.verbose(TAG_TASM,F("dataType [%s]"), dataType);
+  Log.trace(TAG_TASM,F("dataType [%s]"), dataType);
 
   if (!strcmp(dataType, "p[")){   //
     dispatchTextLine(data);
@@ -107,7 +107,7 @@ void TASMO_DATA_RECEIVE(char *data)
     memset(slvVal, 0 ,sizeof(slvVal));
     sscanf(data,"%[^=] =%s", slvCmd, slvVal);
 
-    Log.verbose(TAG_TASM,F("Cmd[%s] Val[%s]"), slvCmd, slvVal);
+    Log.trace(TAG_TASM,F("Cmd[%s] Val[%s]"), slvCmd, slvVal);
 
     if (!strcmp(slvCmd, "calData")){
       if (strlen(slvVal) != 0) {
@@ -133,11 +133,11 @@ void TASMO_EVERY_SECOND(void)
   if (ledstate) {
     ledstate = false;
     //digitalWrite(HASP_OUTPUT_PIN, 1);
-    // Log.verbose(TAG_TASM,F("LED OFF"));
+    // Log.trace(TAG_TASM,F("LED OFF"));
   } else {
     ledstate = true;
     //digitalWrite(HASP_OUTPUT_PIN, 0);
-    // Log.verbose(TAG_TASM,F("LED ON"));
+    // Log.trace(TAG_TASM,F("LED ON"));
   }
 }
 
diff --git a/src/hasp_telnet.cpp b/src/hasp_telnet.cpp
index aab950f9..1a454a5e 100644
--- a/src/hasp_telnet.cpp
+++ b/src/hasp_telnet.cpp
@@ -46,7 +46,7 @@ char telnetInputBuffer[128] = "";
 
 void telnetClientDisconnect()
 {
-    // Log.notice(TAG_TELN,F("Closing session from %s"), telnetClient.remoteIP().toString().c_str());
+    Log.notice(TAG_TELN, F("Closing session from %s"), telnetClient.remoteIP().toString().c_str());
     telnetClient.stop();
     Log.unregisterOutput(1); // telnetClient
     telnetLoginState   = TELNET_UNAUTHENTICATED;
@@ -62,8 +62,8 @@ void telnetClientLogon()
     telnetLoginState   = TELNET_AUTHENTICATED; // User and Pass are correct
     telnetLoginAttempt = 0;                    // Reset attempt counter
     Log.registerOutput(1, &telnetClient, LOG_LEVEL_VERBOSE, true);
-    // Log.notice(TAG_TELN,F("Client login from %s"), telnetClient.remoteIP().toString().c_str());
     telnetClient.flush();
+    Log.notice(TAG_TELN, F("Client login from %s"), telnetClient.remoteIP().toString().c_str());
     /* Echo locally as separate string */
     // telnetClient.print(F("TELNET: Client login from "));
     // telnetClient.println(telnetClient.remoteIP().toString().c_str());
@@ -80,10 +80,10 @@ void telnetAcceptClient()
     telnetClient = telnetServer->available(); // ready for new client
     // Log.notice(TAG_TELN,F("Client connected from %s"), telnetClient.remoteIP().toString().c_str());
     if(!telnetClient) {
-        Log.notice(TAG_TELN, F("Client NOT connected"));
+        Log.verbose(TAG_TELN, F("Client NOT connected"));
         return;
     }
-    Log.notice(TAG_TELN, F("Client connected"));
+    Log.verbose(TAG_TELN, F("Client connected"));
 
     /* Avoid a buffer here */
     telnetClient.print((char)0xFF); // DO TERMINAL-TYPE
@@ -133,8 +133,7 @@ static inline void telnetProcessLine()
                 telnetLoginState = TELNET_UNAUTHENTICATED;
                 telnetLoginAttempt++; // Subsequent attempt
                 telnetClient.println(F("Authorization failed!\r\n"));
-                // Log.warning(TAG_TELN,F("Incorrect login attempt from %s"),
-                // telnetClient.remoteIP().toString().c_str());
+                Log.warning(TAG_TELN, F("Incorrect login attempt from %s"), telnetClient.remoteIP().toString().c_str());
                 if(telnetLoginAttempt >= 3) {
                     telnetClientDisconnect();
                 } else {
@@ -206,7 +205,7 @@ void telnetSetup()
         // if(!telnetServer) telnetServer = new EthernetServer(telnetPort);
         // if(telnetServer) {
         telnetServer->begin();
-        Log.notice(TAG_TELN, F("Debug telnet console started"));
+        Log.trace(TAG_TELN, F("Debug telnet console started"));
         // } else {
         //    Log.error(TAG_TELN,F("Failed to start telnet server"));
         //}
@@ -223,7 +222,7 @@ void telnetSetup()
             telnetClient.setNoDelay(true);
             //}
 
-            Log.notice(TAG_TELN, F("Debug telnet console started"));
+            Log.trace(TAG_TELN, F("Debug telnet console started"));
         } else {
             Log.error(TAG_TELN, F("Failed to start telnet server"));
         }
@@ -246,7 +245,7 @@ void IRAM_ATTR telnetLoop()
                 telnetClient = client; // ready for new client
                 // Log.notice(TAG_TELN,F("Client connected from %s"), telnetClient.remoteIP().toString().c_str());
                 if(!telnetClient) {
-                    Log.notice(TAG_TELN, F("Client NOT connected"));
+                    Log.warning(TAG_TELN, F("Client NOT connected"));
                     return;
                 }
                 Log.notice(TAG_TELN, F("Client connected"));
@@ -289,7 +288,7 @@ bool telnetGetConfig(const JsonObject & settings)
     if(telnetPort != settings[FPSTR(F_CONFIG_PORT)].as<uint16_t>()) changed = true;
     settings[FPSTR(F_CONFIG_PORT)] = telnetPort;
 
-    if(changed) configOutput(settings);
+    if(changed) configOutput(settings, TAG_TELN);
     return changed;
 }
 
@@ -303,7 +302,7 @@ bool telnetGetConfig(const JsonObject & settings)
  **/
 bool telnetSetConfig(const JsonObject & settings)
 {
-    configOutput(settings);
+    configOutput(settings, TAG_TELN);
     bool changed = false;
 
     changed |= configSet(telnetEnabled, settings[FPSTR(F_CONFIG_ENABLE)], F("telnetEnabled"));
diff --git a/src/hasp_wifi.cpp b/src/hasp_wifi.cpp
index f3688c74..fd67aed3 100644
--- a/src/hasp_wifi.cpp
+++ b/src/hasp_wifi.cpp
@@ -57,7 +57,7 @@ void wifiConnected(IPAddress ipaddress)
 #else
     Log.notice(TAG_WIFI, F("Received IP address %s"), ipaddress.toString().c_str());
 #endif
-    Log.verbose(TAG_WIFI, F("Connected = %s"), WiFi.status() == WL_CONNECTED ? PSTR("yes") : PSTR("no"));
+    Log.trace(TAG_WIFI, F("Connected = %s"), WiFi.status() == WL_CONNECTED ? PSTR("yes") : PSTR("no"));
     haspProgressVal(255);
     debugSetup();
     // if(isConnected) {
@@ -369,14 +369,14 @@ void wifiSetup()
 
     // check for the presence of the shield:
     if(WiFiSpi.status() == WL_NO_SHIELD) {
-        Log.notice(TAG_WIFI, F("WiFi shield not present"));
+        Log.fatal(TAG_WIFI, F("WiFi shield not present"));
         // don't continue:
         while(true)
             ;
     }
 
     if(!WiFiSpi.checkProtocolVersion()) {
-        Log.notice(TAG_WIFI, F("Protocol version mismatch. Please upgrade the firmware"));
+        Log.fatal(TAG_WIFI, F("Protocol version mismatch. Please upgrade the firmware"));
         // don't continue:
         while(true)
             ;
@@ -451,7 +451,7 @@ bool wifiGetConfig(const JsonObject & settings)
     if(strcmp(wifiPassword, settings[FPSTR(F_CONFIG_PASS)].as<String>().c_str()) != 0) changed = true;
     settings[FPSTR(F_CONFIG_PASS)] = wifiPassword;
 
-    if(changed) configOutput(settings);
+    if(changed) configOutput(settings, TAG_WIFI);
     return changed;
 }
 
@@ -465,7 +465,7 @@ bool wifiGetConfig(const JsonObject & settings)
  **/
 bool wifiSetConfig(const JsonObject & settings)
 {
-    configOutput(settings);
+    configOutput(settings, TAG_WIFI);
     bool changed = false;
 
     if(!settings[FPSTR(F_CONFIG_SSID)].isNull()) {
@@ -497,14 +497,14 @@ bool wifiTestConnection()
     while(attempt < 10 && (WiFi.status() != WL_CONNECTED || WiFi.localIP().toString() == F("0.0.0.0"))) {
 #endif
         attempt++;
-        Log.verbose(TAG_WIFI, F("Trying to connect to %s... %u"), wifiSsid, attempt);
+        Log.trace(TAG_WIFI, F("Trying to connect to %s... %u"), wifiSsid, attempt);
         delay(1000);
     }
 #if defined(STM32F4xx)
-    Log.verbose(TAG_WIFI, F("Received IP addres %s"), espIp);
+    Log.trace(TAG_WIFI, F("Received IP addres %s"), espIp);
     if((WiFi.status() == WL_CONNECTED && String(espIp) != F("0.0.0.0"))) return true;
 #else
-    Log.verbose(TAG_WIFI, F("Received IP addres %s"), WiFi.localIP().toString().c_str());
+    Log.notice(TAG_WIFI, F("Received IP addres %s"), WiFi.localIP().toString().c_str());
     if((WiFi.status() == WL_CONNECTED && WiFi.localIP().toString() != F("0.0.0.0"))) return true;
 #endif
     WiFi.disconnect();