diff --git a/sonoff/language/bg-BG.h b/sonoff/language/bg-BG.h
index 55482d55c..c46f62486 100644
--- a/sonoff/language/bg-BG.h
+++ b/sonoff/language/bg-BG.h
@@ -205,7 +205,7 @@
 #define D_USE_DEFAULTS "Използване на параметри по подразбиране"
 #define D_ERASED_SECTOR "Изтрит сектор"
 
-// webserver.ino
+// xdrv_02_webserver.ino
 #define D_MINIMAL_FIRMWARE_PLEASE_UPGRADE "Минимаен фърмуеър - моля надградете го"
 #define D_WEBSERVER_ACTIVE_ON "Уеб сървърът е активен на"
 #define D_WITH_IP_ADDRESS "с IP адрес"
@@ -327,7 +327,7 @@
 #define D_ENABLE_WEBLOG_FOR_RESPONSE "Включете ниво 2 на лога, ако очаквате отговор"
 #define D_NEED_USER_AND_PASSWORD "Очаква user=<username>&password=<password>"
 
-// xdrv_00_mqtt.ino
+// xdrv_01_mqtt.ino
 #define D_FINGERPRINT "Проверка на TLS отпечатък..."
 #define D_TLS_CONNECT_FAILED_TO "Неуспешно TLS свързване към"
 #define D_RETRY_IN "Повторно след"
@@ -335,7 +335,7 @@
 #define D_INSECURE "Нешифрована връзка, недействителен отпечатък"
 #define D_CONNECT_FAILED_TO "Грешка при свързването към"
 
-// xdrv_wemohue.ino
+// xplg_wemohue.ino
 #define D_MULTICAST_DISABLED "Multicast е изключен"
 #define D_MULTICAST_REJOINED "Multicast е повторно съединен"
 #define D_MULTICAST_JOIN_FAILED "Multicast грешка при присъединяването"
@@ -355,7 +355,7 @@
 #define D_HUE_POST_ARGS "Hue POST аргументи"
 #define D_3_RESPONSE_PACKETS_SENT "Изпратени са 3 пакета за отговор"
 
-// xdrv_05_domoticz.ino
+// xdrv_07_domoticz.ino
 #define D_DOMOTICZ_PARAMETERS "Domoticz параметри"
 #define D_DOMOTICZ_IDX "Idx"
 #define D_DOMOTICZ_KEY_IDX "Key idx"
diff --git a/sonoff/language/cs-CZ.h b/sonoff/language/cs-CZ.h
index 9f939534a..7cccc011d 100644
--- a/sonoff/language/cs-CZ.h
+++ b/sonoff/language/cs-CZ.h
@@ -205,7 +205,7 @@
 #define D_USE_DEFAULTS "Použij defaultní hodnoty"
 #define D_ERASED_SECTOR "Smazaný sektor"
 
-// webserver.ino
+// xdrv_02_webserver.ino
 #define D_MINIMAL_FIRMWARE_PLEASE_UPGRADE "Firmware MINIMÁLNÍ - prosím zaktualizujte"
 #define D_WEBSERVER_ACTIVE_ON "Aktivní Web server"
 #define D_WITH_IP_ADDRESS "na IP adrese"
@@ -327,7 +327,7 @@
 #define D_ENABLE_WEBLOG_FOR_RESPONSE "Zapni úroveň 2 zápisu Weblog, pokud je očekávána odpověď"
 #define D_NEED_USER_AND_PASSWORD "Vyžadován uživatel=<username>&heslo=<password>"
 
-// xdrv_00_mqtt.ino
+// xdrv_01_mqtt.ino
 #define D_FINGERPRINT "Verifikuj otisk TLS..."
 #define D_TLS_CONNECT_FAILED_TO "Nepřipojeno TLS do"
 #define D_RETRY_IN "Zopakuji za"
@@ -335,7 +335,7 @@
 #define D_INSECURE "Nesprávné připojení z důvodu chybného otisku TLS"
 #define D_CONNECT_FAILED_TO "Spojení se nepodařilo navázat"
 
-// xdrv_wemohue.ino
+// xplg_wemohue.ino
 #define D_MULTICAST_DISABLED "Multicast je vypnutý"
 #define D_MULTICAST_REJOINED "Multicast opět připojený"
 #define D_MULTICAST_JOIN_FAILED "Multicast neúspěšný"
@@ -355,7 +355,7 @@
 #define D_HUE_POST_ARGS "Hue POST args"
 #define D_3_RESPONSE_PACKETS_SENT "3 pakety odpovědi odeslány"
 
-// xdrv_05_domoticz.ino
+// xdrv_07_domoticz.ino
 #define D_DOMOTICZ_PARAMETERS "Nastavení Domoticz"
 #define D_DOMOTICZ_IDX "Idx"
 #define D_DOMOTICZ_KEY_IDX "Key idx"
diff --git a/sonoff/language/de-DE.h b/sonoff/language/de-DE.h
index 7d2e7285d..92b54bba0 100644
--- a/sonoff/language/de-DE.h
+++ b/sonoff/language/de-DE.h
@@ -205,7 +205,7 @@
 #define D_USE_DEFAULTS "Standard verwenden"
 #define D_ERASED_SECTOR "gelöschter Sektor"
 
-// webserver.ino
+// xdrv_02_webserver.ino
 #define D_MINIMAL_FIRMWARE_PLEASE_UPGRADE "MINIMUM-Firmware - bitte upgraden"
 #define D_WEBSERVER_ACTIVE_ON "Web-Server aktiv bei"
 #define D_WITH_IP_ADDRESS "mit IP-Adresse"
@@ -327,7 +327,7 @@
 #define D_ENABLE_WEBLOG_FOR_RESPONSE "Aktivere Web Log Level 2 falls Reaktion erwartet"
 #define D_NEED_USER_AND_PASSWORD "Benötige user=<Benutzername>&password=<Passwort>"
 
-// xdrv_00_mqtt.ino
+// xdrv_01_mqtt.ino
 #define D_FINGERPRINT "TLS-Fingerabdruck wird verifiziert..."
 #define D_TLS_CONNECT_FAILED_TO "TLS-Verbindung fehlgeschlagen an"
 #define D_RETRY_IN "Wiederversuch in"
@@ -335,7 +335,7 @@
 #define D_INSECURE "unsichere Verbindung aufgrund ungültigen Fingerabdrucks"
 #define D_CONNECT_FAILED_TO "Verbindung fehlgeschlagen aufgrund von"
 
-// xdrv_wemohue.ino
+// xplg_wemohue.ino
 #define D_MULTICAST_DISABLED "Multicast deaktiviert"
 #define D_MULTICAST_REJOINED "Multicast (wieder-)verbunden"
 #define D_MULTICAST_JOIN_FAILED "Multicast Verbindung fehlgeschlagen"
@@ -355,7 +355,7 @@
 #define D_HUE_POST_ARGS "Hue POST-Argumente"
 #define D_3_RESPONSE_PACKETS_SENT "3 Antwortpakete gesendet"
 
-// xdrv_05_domoticz.ino
+// xdrv_07_domoticz.ino
 #define D_DOMOTICZ_PARAMETERS "Domoticz-Parameter"
 #define D_DOMOTICZ_IDX "Idx"
 #define D_DOMOTICZ_KEY_IDX "Key idx"
diff --git a/sonoff/language/el-GR.h b/sonoff/language/el-GR.h
index 97eefcd7b..82e1b3e2a 100644
--- a/sonoff/language/el-GR.h
+++ b/sonoff/language/el-GR.h
@@ -205,7 +205,7 @@
 #define D_USE_DEFAULTS "Χρήση προεπιλογών"
 #define D_ERASED_SECTOR "Διαγραμμένος τομέας"
 
-// webserver.ino
+// xdrv_02_webserver.ino
 #define D_MINIMAL_FIRMWARE_PLEASE_UPGRADE "MINIMAL firmware - παρακαλώ αναβαθμήστε"
 #define D_WEBSERVER_ACTIVE_ON "Web διακομιστής ενεργός"
 #define D_WITH_IP_ADDRESS "με διεύθυνση IP"
@@ -327,7 +327,7 @@
 #define D_ENABLE_WEBLOG_FOR_RESPONSE "Ενεργοποιήστε το weblog 2 αν περιμένετε απάντηση"
 #define D_NEED_USER_AND_PASSWORD "Χρειάζεστε user=<όνομα χρήστη>&password=<κωδικό χρήστη>"
 
-// xdrv_00_mqtt.ino
+// xdrv_01_mqtt.ino
 #define D_FINGERPRINT "Επαλήθευση TLS fingerprint..."
 #define D_TLS_CONNECT_FAILED_TO "Αποτυχία TLS σύνδεσης"
 #define D_RETRY_IN "Επανάληψη σε"
@@ -335,7 +335,7 @@
 #define D_INSECURE "Μη ασφαλής σύνδεση λόγο ακατάλληλου Fingerprint"
 #define D_CONNECT_FAILED_TO "Αποτυχία σύνδεσης στο"
 
-// xdrv_wemohue.ino
+// xplg_wemohue.ino
 #define D_MULTICAST_DISABLED "Multicast απενεργοποιημένο"
 #define D_MULTICAST_REJOINED "Multicast επανασύνδεση"
 #define D_MULTICAST_JOIN_FAILED "Αποτυχία σύνδεσης Multicast"
@@ -355,7 +355,7 @@
 #define D_HUE_POST_ARGS "Hue POST args"
 #define D_3_RESPONSE_PACKETS_SENT "3πλο πακέτο απάντησεης στάλθηκε"
 
-// xdrv_05_domoticz.ino
+// xdrv_07_domoticz.ino
 #define D_DOMOTICZ_PARAMETERS "Domoticz παράμετροι"
 #define D_DOMOTICZ_IDX "Idx"
 #define D_DOMOTICZ_KEY_IDX "Key idx"
diff --git a/sonoff/language/en-GB.h b/sonoff/language/en-GB.h
index 9eb8c9d4a..22b91881b 100644
--- a/sonoff/language/en-GB.h
+++ b/sonoff/language/en-GB.h
@@ -205,7 +205,7 @@
 #define D_USE_DEFAULTS "Use defaults"
 #define D_ERASED_SECTOR "Erased sector"
 
-// webserver.ino
+// xdrv_02_webserver.ino
 #define D_MINIMAL_FIRMWARE_PLEASE_UPGRADE "MINIMAL firmware - please upgrade"
 #define D_WEBSERVER_ACTIVE_ON "Web server active on"
 #define D_WITH_IP_ADDRESS "with IP address"
@@ -327,7 +327,7 @@
 #define D_ENABLE_WEBLOG_FOR_RESPONSE "Enable weblog 2 if response expected"
 #define D_NEED_USER_AND_PASSWORD "Need user=<username>&password=<password>"
 
-// xdrv_00_mqtt.ino
+// xdrv_01_mqtt.ino
 #define D_FINGERPRINT "Verify TLS fingerprint..."
 #define D_TLS_CONNECT_FAILED_TO "TLS Connect failed to"
 #define D_RETRY_IN "Retry in"
@@ -335,7 +335,7 @@
 #define D_INSECURE "Insecure connection due to invalid Fingerprint"
 #define D_CONNECT_FAILED_TO "Connect failed to"
 
-// xdrv_wemohue.ino
+// xplg_wemohue.ino
 #define D_MULTICAST_DISABLED "Multicast disabled"
 #define D_MULTICAST_REJOINED "Multicast (re)joined"
 #define D_MULTICAST_JOIN_FAILED "Multicast join failed"
@@ -355,7 +355,7 @@
 #define D_HUE_POST_ARGS "Hue POST args"
 #define D_3_RESPONSE_PACKETS_SENT "3 response packets sent"
 
-// xdrv_05_domoticz.ino
+// xdrv_07_domoticz.ino
 #define D_DOMOTICZ_PARAMETERS "Domoticz parameters"
 #define D_DOMOTICZ_IDX "Idx"
 #define D_DOMOTICZ_KEY_IDX "Key idx"
diff --git a/sonoff/language/es-AR.h b/sonoff/language/es-AR.h
index aff7b2665..e3949cb84 100644
--- a/sonoff/language/es-AR.h
+++ b/sonoff/language/es-AR.h
@@ -205,7 +205,7 @@
 #define D_USE_DEFAULTS "Usar valores por defecto"
 #define D_ERASED_SECTOR "Sector borrado"
 
-// webserver.ino
+// xdrv_02_webserver.ino
 #define D_MINIMAL_FIRMWARE_PLEASE_UPGRADE "Firmware MÍNIMO - actualice por favor"
 #define D_WEBSERVER_ACTIVE_ON "Servidor web activo en"
 #define D_WITH_IP_ADDRESS "con dirección IP"
@@ -327,7 +327,7 @@
 #define D_ENABLE_WEBLOG_FOR_RESPONSE "Habilitar weblog 2 si desea respuesta"
 #define D_NEED_USER_AND_PASSWORD "Se necesita user=<username>&password=<password>"
 
-// xdrv_00_mqtt.ino
+// xdrv_01_mqtt.ino
 #define D_FINGERPRINT "Verificar TLS fingerprint..."
 #define D_TLS_CONNECT_FAILED_TO "Falló Conección TLS a"
 #define D_RETRY_IN "Reintentando"
@@ -335,7 +335,7 @@
 #define D_INSECURE "Conección insegura por Fingerprint no válido"
 #define D_CONNECT_FAILED_TO "Falló Conección a"
 
-// xdrv_wemohue.ino
+// xplg_wemohue.ino
 #define D_MULTICAST_DISABLED "Multicast deshabilitado"
 #define D_MULTICAST_REJOINED "Multicast (re)conectado"
 #define D_MULTICAST_JOIN_FAILED "Conección Multicast fallida"
@@ -355,7 +355,7 @@
 #define D_HUE_POST_ARGS "Hue POST args"
 #define D_3_RESPONSE_PACKETS_SENT "3 paquetes de respuesta enviados"
 
-// xdrv_05_domoticz.ino
+// xdrv_07_domoticz.ino
 #define D_DOMOTICZ_PARAMETERS "Parámetros Domoticz"
 #define D_DOMOTICZ_IDX "Idx"
 #define D_DOMOTICZ_KEY_IDX "Key idx"
diff --git a/sonoff/language/fr-FR.h b/sonoff/language/fr-FR.h
index f37d3cfae..1aeeac42f 100644
--- a/sonoff/language/fr-FR.h
+++ b/sonoff/language/fr-FR.h
@@ -205,7 +205,7 @@
 #define D_USE_DEFAULTS "Utiliser par défaut"
 #define D_ERASED_SECTOR "Secteur effacé"
 
-// webserver.ino
+// xdrv_02_webserver.ino
 #define D_MINIMAL_FIRMWARE_PLEASE_UPGRADE "Firmware MINIMAL - merci de mettre à jour"
 #define D_WEBSERVER_ACTIVE_ON "Serveur web actif sur"
 #define D_WITH_IP_ADDRESS "avec l'adresse IP"
@@ -327,7 +327,7 @@
 #define D_ENABLE_WEBLOG_FOR_RESPONSE "Activer Weblog 2 si une réponse est attendue"
 #define D_NEED_USER_AND_PASSWORD "Nécessite utilisateur=<username>&password=<password>"
 
-// xdrv_00_mqtt.ino
+// xdrv_01_mqtt.ino
 #define D_FINGERPRINT "Vérification d'empreinte TLS ..."
 #define D_TLS_CONNECT_FAILED_TO "Échec de connexion TLS à"
 #define D_RETRY_IN "Nouvelle tentative dans"
@@ -335,7 +335,7 @@
 #define D_INSECURE "Connexion non sécurisée car empreinte non vérifiée"
 #define D_CONNECT_FAILED_TO "Échec de connexion à"
 
-// xdrv_wemohue.ino
+// xplg_wemohue.ino
 #define D_MULTICAST_DISABLED "Multicast désactivé"
 #define D_MULTICAST_REJOINED "Multicast (re)joint"
 #define D_MULTICAST_JOIN_FAILED "Multicast échec abonnement"
@@ -355,7 +355,7 @@
 #define D_HUE_POST_ARGS "Hue POST args"
 #define D_3_RESPONSE_PACKETS_SENT "3 paquets de réponse envoyés"
 
-// xdrv_05_domoticz.ino
+// xdrv_07_domoticz.ino
 #define D_DOMOTICZ_PARAMETERS "Paramètres Domoticz"
 #define D_DOMOTICZ_IDX "Idx"
 #define D_DOMOTICZ_KEY_IDX "Key idx"
diff --git a/sonoff/language/hu-HU.h b/sonoff/language/hu-HU.h
index 4ebeffbf6..05f55fbde 100644
--- a/sonoff/language/hu-HU.h
+++ b/sonoff/language/hu-HU.h
@@ -205,7 +205,7 @@
 #define D_USE_DEFAULTS "Alapértelmezett beáll. használata"
 #define D_ERASED_SECTOR "Szektor törlése"
 
-// webserver.ino
+// xdrv_02_webserver.ino
 #define D_MINIMAL_FIRMWARE_PLEASE_UPGRADE "MINIMAL firmware - frissítsd!"
 #define D_WEBSERVER_ACTIVE_ON "Web szerver aktív a"
 #define D_WITH_IP_ADDRESS "IP címe:"
@@ -327,7 +327,7 @@
 #define D_ENABLE_WEBLOG_FOR_RESPONSE "Engedélyezz 2-es weblogolást több információért"
 #define D_NEED_USER_AND_PASSWORD "Kell felhasználó=<felhasználónév>&jelszó=<jelszó>"
 
-// xdrv_00_mqtt.ino
+// xdrv_01_mqtt.ino
 #define D_FINGERPRINT "TLS fingerprint hitelesítése..."
 #define D_TLS_CONNECT_FAILED_TO "TLS Csatlakozás sikertelen a"
 #define D_RETRY_IN "Újrapróbálás"
@@ -335,7 +335,7 @@
 #define D_INSECURE "Nem biztonságos kapcsolat érvénytelen Fingerprint miatt"
 #define D_CONNECT_FAILED_TO "Sikertelen csatlakozás a"
 
-// xdrv_wemohue.ino
+// xplg_wemohue.ino
 #define D_MULTICAST_DISABLED "Multicast kikapcsolva"
 #define D_MULTICAST_REJOINED "Multicast (újra)csatlakozás"
 #define D_MULTICAST_JOIN_FAILED "Multicast csatlakozás sikertelen"
@@ -355,7 +355,7 @@
 #define D_HUE_POST_ARGS "Hue POST args"
 #define D_3_RESPONSE_PACKETS_SENT "3 válaszcsomagok elküldve"
 
-// xdrv_05_domoticz.ino
+// xdrv_07_domoticz.ino
 #define D_DOMOTICZ_PARAMETERS "Domoticz paraméterek"
 #define D_DOMOTICZ_IDX "Idx"
 #define D_DOMOTICZ_KEY_IDX "Key idx"
diff --git a/sonoff/language/it-IT.h b/sonoff/language/it-IT.h
index 16c11645b..3b43bb555 100644
--- a/sonoff/language/it-IT.h
+++ b/sonoff/language/it-IT.h
@@ -205,7 +205,7 @@
 #define D_USE_DEFAULTS "Utilizzo valori default"
 #define D_ERASED_SECTOR "Settore cancellato"
 
-// webserver.ino
+// xdrv_02_webserver.ino
 #define D_MINIMAL_FIRMWARE_PLEASE_UPGRADE "MINIMAL firmware - effettuare aggiornamento"
 #define D_WEBSERVER_ACTIVE_ON "Web server attivo su"
 #define D_WITH_IP_ADDRESS "con indirizzo IP"
@@ -327,7 +327,7 @@
 #define D_ENABLE_WEBLOG_FOR_RESPONSE "Abilitare weblog 2 se è attesa una risposta"
 #define D_NEED_USER_AND_PASSWORD "Richiesto user=<username>&password=<password>"
 
-// xdrv_00_mqtt.ino
+// xdrv_01_mqtt.ino
 #define D_FINGERPRINT "Verifica TLS fingerprint..."
 #define D_TLS_CONNECT_FAILED_TO "Connessione TLS fallita a"
 #define D_RETRY_IN "Nuovo tentativo in"
@@ -335,7 +335,7 @@
 #define D_INSECURE "Connessione insicura a causa di Fingerprint non valido"
 #define D_CONNECT_FAILED_TO "Connessione Fallita a"
 
-// xdrv_wemohue.ino
+// xplg_wemohue.ino
 #define D_MULTICAST_DISABLED "Multicast disabilitato"
 #define D_MULTICAST_REJOINED "Multicast (ri)associato"
 #define D_MULTICAST_JOIN_FAILED "Associazione Multicast fallita"
@@ -355,7 +355,7 @@
 #define D_HUE_POST_ARGS "Hue POST argomenti"
 #define D_3_RESPONSE_PACKETS_SENT "3 pacchetti di risposta inviati"
 
-// xdrv_05_domoticz.ino
+// xdrv_07_domoticz.ino
 #define D_DOMOTICZ_PARAMETERS "Parametri Domoticz"
 #define D_DOMOTICZ_IDX "Idx"
 #define D_DOMOTICZ_KEY_IDX "Key idx"
diff --git a/sonoff/language/nl-NL.h b/sonoff/language/nl-NL.h
index 262daee7b..65d4af9a5 100644
--- a/sonoff/language/nl-NL.h
+++ b/sonoff/language/nl-NL.h
@@ -205,7 +205,7 @@
 #define D_USE_DEFAULTS "Gebruik standaardwaarden"
 #define D_ERASED_SECTOR "Wis sector"
 
-// webserver.ino
+// xdrv_02_webserver.ino
 #define D_MINIMAL_FIRMWARE_PLEASE_UPGRADE "MINIMAL firmware - opwaarderen"
 #define D_WEBSERVER_ACTIVE_ON "Webserver actief op"
 #define D_WITH_IP_ADDRESS "met IP adres"
@@ -327,7 +327,7 @@
 #define D_ENABLE_WEBLOG_FOR_RESPONSE "Schakel weblog 2 in indien antwoord verwacht"
 #define D_NEED_USER_AND_PASSWORD "Benodig user=<gebruiker>&password=<webwachtwoord>"
 
-// xdrv_00_mqtt.ino
+// xdrv_01_mqtt.ino
 #define D_FINGERPRINT "Controleer TLS vingerafdruk..."
 #define D_TLS_CONNECT_FAILED_TO "TLS Verbinding mislukt naar"
 #define D_RETRY_IN "Opnieuw proberen over"
@@ -335,7 +335,7 @@
 #define D_INSECURE "Door ongeldige vingerafdruk een onveilige verbinding"
 #define D_CONNECT_FAILED_TO "Verbinding mislukt naar"
 
-// xdrv_wemohue.ino
+// xplg_wemohue.ino
 #define D_MULTICAST_DISABLED "Multicast uitgeschakeld"
 #define D_MULTICAST_REJOINED "Multicast verbonden"
 #define D_MULTICAST_JOIN_FAILED "Multicast verbinding mislukt"
@@ -355,7 +355,7 @@
 #define D_HUE_POST_ARGS "Hue POST argumenten"
 #define D_3_RESPONSE_PACKETS_SENT "3 antwoord paketten verstuurd"
 
-// xdrv_05_domoticz.ino
+// xdrv_07_domoticz.ino
 #define D_DOMOTICZ_PARAMETERS "Domoticz parameters"
 #define D_DOMOTICZ_IDX "Idx"
 #define D_DOMOTICZ_KEY_IDX "Toets idx"
diff --git a/sonoff/language/pl-PL.h b/sonoff/language/pl-PL.h
index 683d43cb3..0a9a77d52 100644
--- a/sonoff/language/pl-PL.h
+++ b/sonoff/language/pl-PL.h
@@ -205,7 +205,7 @@
 #define D_USE_DEFAULTS "Użyj domyślnych"
 #define D_ERASED_SECTOR "Wymazany sektor"
 
-// webserver.ino
+// xdrv_02_webserver.ino
 #define D_MINIMAL_FIRMWARE_PLEASE_UPGRADE "Oprogramowanie MINIMAL - proszę uaktualnić"
 #define D_WEBSERVER_ACTIVE_ON "Aktywny serwer Web"
 #define D_WITH_IP_ADDRESS "z adresem IP"
@@ -327,7 +327,7 @@
 #define D_ENABLE_WEBLOG_FOR_RESPONSE "Włącz poziom 2 zapisu Weblog, jeśli oczekiwana jest odpowiedź"
 #define D_NEED_USER_AND_PASSWORD "Wymagany użytkownik=<username>&hasło=<password>"
 
-// xdrv_00_mqtt.ino
+// xdrv_01_mqtt.ino
 #define D_FINGERPRINT "Weryfikuj odcisk TLS..."
 #define D_TLS_CONNECT_FAILED_TO "Nieudane połączenie TLS do"
 #define D_RETRY_IN "Spróbuj ponownie"
@@ -335,7 +335,7 @@
 #define D_INSECURE "Nieprawidłowe połączenie z powodu błędnego odcisku TLS"
 #define D_CONNECT_FAILED_TO "Nie udało się nawiązać połączenia"
 
-// xdrv_wemohue.ino
+// xplg_wemohue.ino
 #define D_MULTICAST_DISABLED "Multicast jest wyłączony"
 #define D_MULTICAST_REJOINED "Multicast (re)dołączony"
 #define D_MULTICAST_JOIN_FAILED "Multicast nie powiodło się"
@@ -355,7 +355,7 @@
 #define D_HUE_POST_ARGS "Hue POST args"
 #define D_3_RESPONSE_PACKETS_SENT "3 pakiety odpowiedzi wysyłane"
 
-// xdrv_05_domoticz.ino
+// xdrv_07_domoticz.ino
 #define D_DOMOTICZ_PARAMETERS "Parametry Domoticz"
 #define D_DOMOTICZ_IDX "Idx"
 #define D_DOMOTICZ_KEY_IDX "Key idx"
diff --git a/sonoff/language/pt-BR.h b/sonoff/language/pt-BR.h
index 02bdec2e4..cec9cde64 100644
--- a/sonoff/language/pt-BR.h
+++ b/sonoff/language/pt-BR.h
@@ -28,7 +28,7 @@
  * Use online command StateText to translate ON, OFF, HOLD and TOGGLE.
  * Use online command Prefix to translate cmnd, stat and tele.
  *
- * Updated until v5.13.0
+ * Updated until v5.14.0b
 \*********************************************************************/
 
 //#define LANGUAGE_MODULE_NAME         // Enable to display "Module Generic" (ie Spanish), Disable to display "Generic Module" (ie English)
@@ -52,8 +52,8 @@
 
 // Common
 #define D_ADMIN "Admin"
-#define D_AIR_QUALITY "Qualidade do Ar"
-#define D_AP "Pondo de acesso"                    // Ponto de Acesso
+#define D_AIR_QUALITY "Qualidade do ar"
+#define D_AP "Ponto de acesso"     	// Ponto de Acesso
 #define D_AS "como"
 #define D_AUTO "Auto"
 #define D_BLINK "Pulsar"
@@ -64,16 +64,16 @@
 #define D_BY "por"                    // Write by me
 #define D_BYTES "Bytes"
 #define D_CELSIUS "Celsius"
-#define D_CO2 "Dióxido de Carbono"
+#define D_CO2 "Dióxido de carbono"
 #define D_CODE "Código"                // Button code
-#define D_COLDLIGHT "Luz Fria"
+#define D_COLDLIGHT "Luz fria"
 #define D_COMMAND "Comando"
 #define D_CONNECTED "Ligado"
 #define D_COUNT "Contagem"
 #define D_COUNTER "Contador"
 #define D_CURRENT "Corrente"          // As in Voltage and Current
 #define D_DATA "Dados"
-#define D_DARKLIGHT "Luz Escura"
+#define D_DARKLIGHT "Luz escura"
 #define D_DEBUG "Depurar"
 #define D_DISABLED "Desabilitado"
 #define D_DISTANCE "Distância"
@@ -91,8 +91,8 @@
 #define D_FALLBACK_TOPIC "Tópico para retornar"
 #define D_FALSE "Falso"
 #define D_FILE "Arquivo"
-#define D_FREE_MEMORY "Memória Livre"
-#define D_FREQUENCY "Frequency"
+#define D_FREE_MEMORY "Memória livre"
+#define D_FREQUENCY "Frequência"
 #define D_GAS "Gás"
 #define D_GATEWAY "Gateway"
 #define D_GROUP "Grupo"
@@ -103,7 +103,7 @@
 #define D_IMMEDIATE "Imediato"      // Button immediate
 #define D_INDEX "Índice"
 #define D_INFO "Informação"
-#define D_INFRARED "Infrared"
+#define D_INFRARED "Infravermelho"
 #define D_INITIALIZED "Inicializado"
 #define D_IP_ADDRESS "Endereço IP"
 #define D_LIGHT "Luz"
@@ -122,9 +122,9 @@
 #define D_PORT "Porta"
 #define D_POWER_FACTOR "Fator de potência"
 #define D_POWERUSAGE "Potência"
-#define D_POWERUSAGE_ACTIVE "Active Power"
-#define D_POWERUSAGE_APPARENT "Apparent Power"
-#define D_POWERUSAGE_REACTIVE "Reactive Power"
+#define D_POWERUSAGE_ACTIVE "Potência ativa"
+#define D_POWERUSAGE_APPARENT "Potência aparente"
+#define D_POWERUSAGE_REACTIVE "Potência reativa"
 #define D_PRESSURE "Pressão"
 #define D_PRESSUREATSEALEVEL "Pressão ao nível do mar"
 #define D_PROGRAM_FLASH_SIZE "Tamanho do programa na memória"
@@ -168,10 +168,10 @@
 #define D_WEB_SERVER "Servidor WEB"
 
 // sonoff.ino
-#define D_WARNING_MINIMAL_VERSION "AVISO esta versão não supporta configurações persistentes"
+#define D_WARNING_MINIMAL_VERSION "AVISO: esta versão não supporta configurações persistentes"
 #define D_LEVEL_10 "nível 1-0"
 #define D_LEVEL_01 "nível 0-1"
-#define D_SERIAL_LOGGING_DISABLED "Registro em serie desabilitado"
+#define D_SERIAL_LOGGING_DISABLED "Registro em série desabilitado"
 #define D_SYSLOG_LOGGING_REENABLED "Registro do Syslog reativado"
 
 #define D_SET_BAUDRATE_TO "Ajuste da velocidade para"
@@ -205,15 +205,15 @@
 #define D_USE_DEFAULTS "Usar predefinições"
 #define D_ERASED_SECTOR "Apagar setores"
 
-// webserver.ino
+// xdrv_02_webserver.ino
 #define D_MINIMAL_FIRMWARE_PLEASE_UPGRADE "Firmware mínimo - Atualizar por favor"
 #define D_WEBSERVER_ACTIVE_ON "Servidor WEB ativo em"
 #define D_WITH_IP_ADDRESS "com o endereço IP"
 #define D_WEBSERVER_STOPPED "Servidor WEB parou"
 #define D_FILE_NOT_FOUND "Arquivo não encontrado"
 #define D_REDIRECTED "Redirecionado para o portal ativo"
-#define D_WIFIMANAGER_SET_ACCESSPOINT_AND_STATION "Wifimanager configura o Ponto de Acesso e mantém a estação"
-#define D_WIFIMANAGER_SET_ACCESSPOINT "Wifimanager configura o Ponto de Acesso"
+#define D_WIFIMANAGER_SET_ACCESSPOINT_AND_STATION "Wifimanager: configura o Ponto de Acesso e a Estação"
+#define D_WIFIMANAGER_SET_ACCESSPOINT "Wifimanager: configura o Ponto de Acesso"
 #define D_TRYING_TO_CONNECT "Conectar o dispositivo à rede"
 
 #define D_RESTART_IN "Reinicia em"
@@ -238,7 +238,7 @@
 #define D_RESTORE_CONFIGURATION "Repor configuração"
 #define D_MAIN_MENU "Menu principal"
 
-#define D_MODULE_PARAMETERS "Parametros do módulo"
+#define D_MODULE_PARAMETERS "Parâmetros do módulo"
 #define D_MODULE_TYPE "Tipo de módulo"
 #define D_GPIO "GPIO"
 #define D_SERIAL_IN "Entrada serial"
@@ -282,12 +282,12 @@
 #define D_SINGLE_DEVICE "Dispositivo único"
 #define D_MULTI_DEVICE "Múltiplos dispositivos"
 
-#define D_SAVE_CONFIGURATION "Salvar configuração"
-#define D_CONFIGURATION_SAVED "Configuração salva"
+#define D_SAVE_CONFIGURATION "Gravar configuração"
+#define D_CONFIGURATION_SAVED "Configuração gravada"
 #define D_CONFIGURATION_RESET "Reinicialização da configuração"
 
 #define D_PROGRAM_VERSION "Versão do programa"
-#define D_BUILD_DATE_AND_TIME "Data e Hora da construção"
+#define D_BUILD_DATE_AND_TIME "Data e Hora da compilação"
 #define D_CORE_AND_SDK_VERSION "Versão Core/SDK"
 #define D_FLASH_WRITE_COUNT "Contagem de gravação flash"
 #define D_MAC_ADDRESS "Endereço MAC"
@@ -327,7 +327,7 @@
 #define D_ENABLE_WEBLOG_FOR_RESPONSE "Habilitar weblog 2 se resposta esperada"
 #define D_NEED_USER_AND_PASSWORD "Necessário user=<nome usuário>&password=<senha>"
 
-// xdrv_00_mqtt.ino
+// xdrv_01_mqtt.ino
 #define D_FINGERPRINT "Verifique a impressão digital TLS..."
 #define D_TLS_CONNECT_FAILED_TO "TLS não conseguiu ligar"
 #define D_RETRY_IN "Tentativa em"
@@ -335,7 +335,7 @@
 #define D_INSECURE "Ligação insegura devido à impressão digital inválida"
 #define D_CONNECT_FAILED_TO "A ligação falhou ao"
 
-// xdrv_wemohue.ino
+// xplg_wemohue.ino
 #define D_MULTICAST_DISABLED "Multicast desabilitado"
 #define D_MULTICAST_REJOINED "Multicast (re)ingressou"
 #define D_MULTICAST_JOIN_FAILED "Multicast falha no reingresso"
@@ -355,15 +355,15 @@
 #define D_HUE_POST_ARGS "Hue POST args"
 #define D_3_RESPONSE_PACKETS_SENT "3 pacotes de resposta enviados"
 
-// xdrv_05_domoticz.ino
+// xdrv_07_domoticz.ino
 #define D_DOMOTICZ_PARAMETERS "Parâmetros Domoticz"
 #define D_DOMOTICZ_IDX "Idx"
 #define D_DOMOTICZ_KEY_IDX "Chave idx"
 #define D_DOMOTICZ_SWITCH_IDX "Interruptor idx"
 #define D_DOMOTICZ_SENSOR_IDX "Sensor idx"
   #define D_DOMOTICZ_TEMP "Temp"
-  #define D_DOMOTICZ_TEMP_HUM "Temp,Hum"
-  #define D_DOMOTICZ_TEMP_HUM_BARO "Temp,Hum,Baro"
+  #define D_DOMOTICZ_TEMP_HUM "Temp,Umi"
+  #define D_DOMOTICZ_TEMP_HUM_BARO "Temp,Umi,Pres"
   #define D_DOMOTICZ_POWER_ENERGY "Potência,Energia"
   #define D_DOMOTICZ_ILLUMINANCE "Luminância"
   #define D_DOMOTICZ_COUNT "Contagem/PM1"
@@ -401,7 +401,7 @@
 #define D_KNX_COMMAND_OTHER "Outros"
 #define D_SENT_TO "Enviar para"
 #define D_KNX_WARNING "O endereço ( 0 / 0 / 0 ) é reservado e não pode ser usado."
-#define D_KNX_ENHANCEMENT "Communication Enhancement"
+#define D_KNX_ENHANCEMENT "Melhoria da comunicação"
 
 // xdrv_03_energy.ino
 #define D_ENERGY_TODAY "Consumo energético de hoje"
@@ -439,19 +439,19 @@
 #define D_SENSOR_I2C_SDA  "I2C SDA"
 #define D_SENSOR_WS2812   "WS2812"
 #define D_SENSOR_IRSEND   "IRsend"
-#define D_SENSOR_SWITCH   "Interruptor"   // Suffix "1"
-#define D_SENSOR_BUTTON   "Botão"   // Suffix "1"
-#define D_SENSOR_RELAY    "Relé"    // Suffix "1i"
-#define D_SENSOR_LED      "Led"      // Suffix "1i"
-#define D_SENSOR_PWM      "PWM"      // Suffix "1"
-#define D_SENSOR_COUNTER  "Contador"  // Suffix "1"
+#define D_SENSOR_SWITCH   "Interruptor"	// Suffix "1"
+#define D_SENSOR_BUTTON   "Botão"   	// Suffix "1"
+#define D_SENSOR_RELAY    "Relé"    	// Suffix "1i"
+#define D_SENSOR_LED      "Led"      	// Suffix "1i"
+#define D_SENSOR_PWM      "PWM"      	// Suffix "1"
+#define D_SENSOR_COUNTER  "Contador"  	// Suffix "1"
 #define D_SENSOR_IRRECV   "IRrecv"
-#define D_SENSOR_MHZ_RX   "MHZ Rx"
-#define D_SENSOR_MHZ_TX   "MHZ Tx"
+#define D_SENSOR_MHZ_RX   "MHz Rx"
+#define D_SENSOR_MHZ_TX   "MHz Tx"
 #define D_SENSOR_PZEM_RX  "PZEM Rx"
 #define D_SENSOR_PZEM_TX  "PZEM Tx"
-#define D_SENSOR_SAIR_RX  "SAir Rx"
-#define D_SENSOR_SAIR_TX  "SAir Tx"
+#define D_SENSOR_SAIR_RX  "SAIR Rx"
+#define D_SENSOR_SAIR_TX  "SAIR Tx"
 #define D_SENSOR_SPI_CS   "SPI CS"
 #define D_SENSOR_SPI_DC   "SPI DC"
 #define D_SENSOR_BACKLIGHT "Luz de fundo"
diff --git a/sonoff/language/pt-PT.h b/sonoff/language/pt-PT.h
index 4cf9e0da3..2f8993745 100644
--- a/sonoff/language/pt-PT.h
+++ b/sonoff/language/pt-PT.h
@@ -205,7 +205,7 @@
 #define D_USE_DEFAULTS "Usar predefinições"
 #define D_ERASED_SECTOR "Apagar setores"
 
-// webserver.ino
+// xdrv_02_webserver.ino
 #define D_MINIMAL_FIRMWARE_PLEASE_UPGRADE "MINIMO firmware - Atualizar Por favor"
 #define D_WEBSERVER_ACTIVE_ON "Servidor WEB ativo em"
 #define D_WITH_IP_ADDRESS "com o endereço IP"
@@ -327,7 +327,7 @@
 #define D_ENABLE_WEBLOG_FOR_RESPONSE "Habilitar weblog 2 se resposta esperada"
 #define D_NEED_USER_AND_PASSWORD "Necessário user=<nome utilizador>&password=<palavra chave>"
 
-// xdrv_00_mqtt.ino
+// xdrv_01_mqtt.ino
 #define D_FINGERPRINT "Verifique a impressão digital TLS..."
 #define D_TLS_CONNECT_FAILED_TO "TLS não conseguiu ligar"
 #define D_RETRY_IN "Tentativa em"
@@ -335,7 +335,7 @@
 #define D_INSECURE "Ligação insegura devido à impressão digital inválida"
 #define D_CONNECT_FAILED_TO "A ligação falhou ao"
 
-// xdrv_wemohue.ino
+// xplg_wemohue.ino
 #define D_MULTICAST_DISABLED "Multicast desabilitado"
 #define D_MULTICAST_REJOINED "Multicast (re)ingressou"
 #define D_MULTICAST_JOIN_FAILED "Multicast falha no reingresso"
@@ -355,7 +355,7 @@
 #define D_HUE_POST_ARGS "Hue POST args"
 #define D_3_RESPONSE_PACKETS_SENT "3 pacotes de resposta enviados"
 
-// xdrv_05_domoticz.ino
+// xdrv_07_domoticz.ino
 #define D_DOMOTICZ_PARAMETERS "Parametros Domoticz"
 #define D_DOMOTICZ_IDX "Idx"
 #define D_DOMOTICZ_KEY_IDX "Chave idx"
diff --git a/sonoff/language/ru-RU.h b/sonoff/language/ru-RU.h
index 3336484e9..a366e92a7 100644
--- a/sonoff/language/ru-RU.h
+++ b/sonoff/language/ru-RU.h
@@ -205,7 +205,7 @@
 #define D_USE_DEFAULTS "Использовать значение по умолчанию"
 #define D_ERASED_SECTOR "Стереть сектор"
 
-// webserver.ino
+// xdrv_02_webserver.ino
 #define D_MINIMAL_FIRMWARE_PLEASE_UPGRADE "Прошивка MINIMAL - пожалуйста обновите"
 #define D_WEBSERVER_ACTIVE_ON "Веб-сервер активен"
 #define D_WITH_IP_ADDRESS "с IP-адресом"
@@ -327,7 +327,7 @@
 #define D_ENABLE_WEBLOG_FOR_RESPONSE "Включить Веб лог уровня 2 если ожидается ответ"
 #define D_NEED_USER_AND_PASSWORD "Ожидается user=<username>&password=<password>"
 
-// xdrv_00_mqtt.ino
+// xdrv_01_mqtt.ino
 #define D_FINGERPRINT "Проверка TLS Fingerprint..."
 #define D_TLS_CONNECT_FAILED_TO "Сбой подключения TLS к"
 #define D_RETRY_IN "Повторить"
@@ -335,7 +335,7 @@
 #define D_INSECURE "Небезопасное соединение, недействительный Fingerprint"
 #define D_CONNECT_FAILED_TO "Ошибка подключения к"
 
-// xdrv_wemohue.ino
+// xplg_wemohue.ino
 #define D_MULTICAST_DISABLED "Multicast отключен"
 #define D_MULTICAST_REJOINED "Multicast (ре)соединился"
 #define D_MULTICAST_JOIN_FAILED "Multicast ошибка соединения"
@@ -355,7 +355,7 @@
 #define D_HUE_POST_ARGS "Hue POST args"
 #define D_3_RESPONSE_PACKETS_SENT "3 ответных пакета получено"
 
-// xdrv_05_domoticz.ino
+// xdrv_07_domoticz.ino
 #define D_DOMOTICZ_PARAMETERS "Domoticz parameters"
 #define D_DOMOTICZ_IDX "Idx"
 #define D_DOMOTICZ_KEY_IDX "Key idx"
diff --git a/sonoff/language/uk-UK.h b/sonoff/language/uk-UK.h
index 7e74fa92e..f939161d4 100644
--- a/sonoff/language/uk-UK.h
+++ b/sonoff/language/uk-UK.h
@@ -205,7 +205,7 @@
 #define D_USE_DEFAULTS "Використовувати значення за замовчуванням"
 #define D_ERASED_SECTOR "Стерти сектор"
 
-// webserver.ino
+// xdrv_02_webserver.ino
 #define D_MINIMAL_FIRMWARE_PLEASE_UPGRADE "Прошивка MINIMAL - будь-ласка оновіть"
 #define D_WEBSERVER_ACTIVE_ON "Веб-сервер активний"
 #define D_WITH_IP_ADDRESS "з IP-адресом"
@@ -327,7 +327,7 @@
 #define D_ENABLE_WEBLOG_FOR_RESPONSE "Увімкніть Веб лог рівня 2 якщо очікуєте відповідь"
 #define D_NEED_USER_AND_PASSWORD "Очікується user=<username>&password=<password>"
 
-// xdrv_00_mqtt.ino
+// xdrv_01_mqtt.ino
 #define D_FINGERPRINT "Перевірка TLS відбитка..."
 #define D_TLS_CONNECT_FAILED_TO "Збій підключення TLS до"
 #define D_RETRY_IN "Повторити"
@@ -335,7 +335,7 @@
 #define D_INSECURE "Небезпечне з'єднання, недійсний відбиток "
 #define D_CONNECT_FAILED_TO "Помилка підключення до"
 
-// xdrv_wemohue.ino
+// xplg_wemohue.ino
 #define D_MULTICAST_DISABLED "Multicast вимкнений"
 #define D_MULTICAST_REJOINED "Multicast (пере)під'єднався"
 #define D_MULTICAST_JOIN_FAILED "Multicast помилка з'єднання"
@@ -355,7 +355,7 @@
 #define D_HUE_POST_ARGS "Hue POST args"
 #define D_3_RESPONSE_PACKETS_SENT "3 пакету відповіді  отримано"
 
-// xdrv_05_domoticz.ino
+// xdrv_07_domoticz.ino
 #define D_DOMOTICZ_PARAMETERS "Domoticz налаштування"
 #define D_DOMOTICZ_IDX "Idx"
 #define D_DOMOTICZ_KEY_IDX "Ключ idx"
diff --git a/sonoff/language/zh-CN.h b/sonoff/language/zh-CN.h
index 1c3ee0bb7..005ffb6d5 100644
--- a/sonoff/language/zh-CN.h
+++ b/sonoff/language/zh-CN.h
@@ -205,7 +205,7 @@
 #define D_USE_DEFAULTS "使用默认设置"
 #define D_ERASED_SECTOR "擦除删除"
 
-// webserver.ino
+// xdrv_02_webserver.ino
 #define D_MINIMAL_FIRMWARE_PLEASE_UPGRADE "固件版本过低 - 请升级"
 #define D_WEBSERVER_ACTIVE_ON "Web服务器:"
 #define D_WITH_IP_ADDRESS "IP地址:"
@@ -327,7 +327,7 @@
 #define D_ENABLE_WEBLOG_FOR_RESPONSE "如果预期响应，则启用Weblog 2"
 #define D_NEED_USER_AND_PASSWORD "需要 user=<用户名>&password=<密码>"
 
-// xdrv_00_mqtt.ino
+// xdrv_01_mqtt.ino
 #define D_FINGERPRINT "验证 TLS 指纹..."
 #define D_TLS_CONNECT_FAILED_TO "TLS 连接失败"
 #define D_RETRY_IN "重试倒计时:"
@@ -335,7 +335,7 @@
 #define D_INSECURE "指纹无效导致连接不安全"
 #define D_CONNECT_FAILED_TO "连接失败:"
 
-// xdrv_wemohue.ino
+// xplg_wemohue.ino
 #define D_MULTICAST_DISABLED "组播已禁用"
 #define D_MULTICAST_REJOINED "组播已(重新)加入"
 #define D_MULTICAST_JOIN_FAILED "组播加入失败"
@@ -355,7 +355,7 @@
 #define D_HUE_POST_ARGS "Hue POST 参数"
 #define D_3_RESPONSE_PACKETS_SENT "3 请求包发送"
 
-// xdrv_05_domoticz.ino
+// xdrv_07_domoticz.ino
 #define D_DOMOTICZ_PARAMETERS "Domoticz 设置"
 #define D_DOMOTICZ_IDX "Idx"
 #define D_DOMOTICZ_KEY_IDX "Key idx"
diff --git a/sonoff/language/zh-TW.h b/sonoff/language/zh-TW.h
index e8505010f..27f7cd9d8 100644
--- a/sonoff/language/zh-TW.h
+++ b/sonoff/language/zh-TW.h
@@ -205,7 +205,7 @@
 #define D_USE_DEFAULTS "使用默認設置"
 #define D_ERASED_SECTOR "擦除刪除"
 
-// webserver.ino
+// xdrv_02_webserver.ino
 #define D_MINIMAL_FIRMWARE_PLEASE_UPGRADE "固件版本過低 - 請升級"
 #define D_WEBSERVER_ACTIVE_ON "Web服務器:"
 #define D_WITH_IP_ADDRESS "IP地址:"
@@ -327,7 +327,7 @@
 #define D_ENABLE_WEBLOG_FOR_RESPONSE "如果預期響應，則啟用Weblog 2"
 #define D_NEED_USER_AND_PASSWORD "需要 user=<用戶名>&password=<密碼>"
 
-// xdrv_00_mqtt.ino
+// xdrv_01_mqtt.ino
 #define D_FINGERPRINT "驗證 TLS 指紋..."
 #define D_TLS_CONNECT_FAILED_TO "TLS 連接失敗"
 #define D_RETRY_IN "重試倒計時:"
@@ -335,7 +335,7 @@
 #define D_INSECURE "指紋無效導致連接不安全"
 #define D_CONNECT_FAILED_TO "連接失敗:"
 
-// xdrv_wemohue.ino
+// xplg_wemohue.ino
 #define D_MULTICAST_DISABLED "組播已禁用"
 #define D_MULTICAST_REJOINED "組播已(重新)加入"
 #define D_MULTICAST_JOIN_FAILED "組播加入失敗"
@@ -355,7 +355,7 @@
 #define D_HUE_POST_ARGS "Hue POST 參數"
 #define D_3_RESPONSE_PACKETS_SENT "3 請求包發送"
 
-// xdrv_05_domoticz.ino
+// xdrv_07_domoticz.ino
 #define D_DOMOTICZ_PARAMETERS "Domoticz 設置"
 #define D_DOMOTICZ_IDX "Idx"
 #define D_DOMOTICZ_KEY_IDX "Key idx"