diff --git a/sonoff/language/bg-BG.h b/sonoff/language/bg-BG.h
index c38fbe5b7..dbf2ab408 100644
--- a/sonoff/language/bg-BG.h
+++ b/sonoff/language/bg-BG.h
@@ -496,7 +496,6 @@
 //xsns_43_hre.ino
 #define D_LOG_HRE "HRE: "
 
-
 // sonoff_template.h - keep them as short as possible to be able to fit them in GUI drop down box
 #define D_SENSOR_NONE          "Няма"
 #define D_SENSOR_USER          "Потребит."
@@ -588,8 +587,8 @@
 #define D_SENSOR_ADE7953_IRQ   "ADE7953 IRQ"
 #define D_SENSOR_BUZZER        "Buzzer"
 #define D_SENSOR_OLED_RESET    "OLED Reset"
-#define D_SENSOR_SOLAXX1_TX    "SOLAXX1 Tx"
-#define D_SENSOR_SOLAXX1_RX    "SOLAXX1 Rx"
+#define D_SENSOR_SOLAXX1_TX    "SolaxX1 Tx"
+#define D_SENSOR_SOLAXX1_RX    "SolaxX1 Rx"
 
 // Units
 #define D_UNIT_AMPERE "A"
@@ -660,7 +659,6 @@
 #define D_UNIT_KWARH      "kVArh"
 #define D_UNIT_ANGLE      "°"
 
-#ifdef USE_SOLAX_X1
 //SOLAXX1
 #define D_PV1_VOLTAGE     "PV1 Voltage"
 #define D_PV1_CURRENT     "PV1 Current"
@@ -670,24 +668,19 @@
 #define D_PV2_POWER       "PV2 Power"
 #define D_SOLAR_POWER     "Solar Power"
 #define D_INVERTER_POWER  "Inverter Power"
-#define D_WORKTIME        "Uptime"
 #define D_STATUS          "Status"
-#define D_UNIT_TEMPERATURE "°C"
-
-#define D_WAITING          "Waiting"
-#define D_CHECKING         "Checking"
-#define D_WORKING          "Working"
-#define D_FAILURE          "Failure"
-
-#define D_SOLAX_ERROR_0    "No Error Code"
-#define D_SOLAX_ERROR_1    "Grid Lost Fault"
-#define D_SOLAX_ERROR_2    "Grid Voltage Fault"
-#define D_SOLAX_ERROR_3    "Grid Frequency Fault"
-#define D_SOLAX_ERROR_4    "Pv Voltage Fault"
-#define D_SOLAX_ERROR_5    "Isolation Fault"
-#define D_SOLAX_ERROR_6    "Over Temperature Fault"
-#define D_SOLAX_ERROR_7    "Fan Fault"
-#define D_SOLAX_ERROR_8    "Other Device Fault"
-#endif
+#define D_WAITING         "Waiting"
+#define D_CHECKING        "Checking"
+#define D_WORKING         "Working"
+#define D_FAILURE         "Failure"
+#define D_SOLAX_ERROR_0   "No Error Code"
+#define D_SOLAX_ERROR_1   "Grid Lost Fault"
+#define D_SOLAX_ERROR_2   "Grid Voltage Fault"
+#define D_SOLAX_ERROR_3   "Grid Frequency Fault"
+#define D_SOLAX_ERROR_4   "Pv Voltage Fault"
+#define D_SOLAX_ERROR_5   "Isolation Fault"
+#define D_SOLAX_ERROR_6   "Over Temperature Fault"
+#define D_SOLAX_ERROR_7   "Fan Fault"
+#define D_SOLAX_ERROR_8   "Other Device Fault"
 
 #endif  // _LANGUAGE_BG_BG_H_
diff --git a/sonoff/language/cs-CZ.h b/sonoff/language/cs-CZ.h
index 03be8295e..b1b4ab633 100644
--- a/sonoff/language/cs-CZ.h
+++ b/sonoff/language/cs-CZ.h
@@ -587,8 +587,8 @@
 #define D_SENSOR_ADE7953_IRQ   "ADE7953 IRQ"
 #define D_SENSOR_BUZZER        "Buzzer"
 #define D_SENSOR_OLED_RESET    "OLED Reset"
-#define D_SENSOR_SOLAXX1_TX    "SOLAXX1 Tx"
-#define D_SENSOR_SOLAXX1_RX    "SOLAXX1 Rx"
+#define D_SENSOR_SOLAXX1_TX    "SolaxX1 Tx"
+#define D_SENSOR_SOLAXX1_RX    "SolaxX1 Rx"
 
 // Units
 #define D_UNIT_AMPERE "A"
@@ -659,7 +659,6 @@
 #define D_UNIT_KWARH      "kVArh"
 #define D_UNIT_ANGLE      "Deg"
 
-#ifdef USE_SOLAX_X1
 //SOLAXX1
 #define D_PV1_VOLTAGE     "PV1 Voltage"
 #define D_PV1_CURRENT     "PV1 Current"
@@ -669,24 +668,19 @@
 #define D_PV2_POWER       "PV2 Power"
 #define D_SOLAR_POWER     "Solar Power"
 #define D_INVERTER_POWER  "Inverter Power"
-#define D_WORKTIME        "Uptime"
 #define D_STATUS          "Status"
-#define D_UNIT_TEMPERATURE "°C"
-
-#define D_WAITING          "Waiting"
-#define D_CHECKING         "Checking"
-#define D_WORKING          "Working"
-#define D_FAILURE          "Failure"
-
-#define D_SOLAX_ERROR_0    "No Error Code"
-#define D_SOLAX_ERROR_1    "Grid Lost Fault"
-#define D_SOLAX_ERROR_2    "Grid Voltage Fault"
-#define D_SOLAX_ERROR_3    "Grid Frequency Fault"
-#define D_SOLAX_ERROR_4    "Pv Voltage Fault"
-#define D_SOLAX_ERROR_5    "Isolation Fault"
-#define D_SOLAX_ERROR_6    "Over Temperature Fault"
-#define D_SOLAX_ERROR_7    "Fan Fault"
-#define D_SOLAX_ERROR_8    "Other Device Fault"
-#endif
+#define D_WAITING         "Waiting"
+#define D_CHECKING        "Checking"
+#define D_WORKING         "Working"
+#define D_FAILURE         "Failure"
+#define D_SOLAX_ERROR_0   "No Error Code"
+#define D_SOLAX_ERROR_1   "Grid Lost Fault"
+#define D_SOLAX_ERROR_2   "Grid Voltage Fault"
+#define D_SOLAX_ERROR_3   "Grid Frequency Fault"
+#define D_SOLAX_ERROR_4   "Pv Voltage Fault"
+#define D_SOLAX_ERROR_5   "Isolation Fault"
+#define D_SOLAX_ERROR_6   "Over Temperature Fault"
+#define D_SOLAX_ERROR_7   "Fan Fault"
+#define D_SOLAX_ERROR_8   "Other Device Fault"
 
 #endif  // _LANGUAGE_CS_CZ_H_
diff --git a/sonoff/language/de-DE.h b/sonoff/language/de-DE.h
index 200c31356..3a8947be7 100644
--- a/sonoff/language/de-DE.h
+++ b/sonoff/language/de-DE.h
@@ -587,8 +587,8 @@
 #define D_SENSOR_ADE7953_IRQ   "ADE7953 IRQ"
 #define D_SENSOR_BUZZER        "Buzzer"
 #define D_SENSOR_OLED_RESET    "OLED Reset"
-#define D_SENSOR_SOLAXX1_TX    "SOLAXX1 Tx"
-#define D_SENSOR_SOLAXX1_RX    "SOLAXX1 Rx"
+#define D_SENSOR_SOLAXX1_TX    "SolaxX1 Tx"
+#define D_SENSOR_SOLAXX1_RX    "SolaxX1 Rx"
 
 // Units
 #define D_UNIT_AMPERE "A"
@@ -659,7 +659,6 @@
 #define D_UNIT_KWARH      "kVArh"
 #define D_UNIT_ANGLE      "Grad"
 
-#ifdef USE_SOLAX_X1
 //SOLAXX1
 #define D_PV1_VOLTAGE     "PV1 Voltage"
 #define D_PV1_CURRENT     "PV1 Current"
@@ -669,24 +668,19 @@
 #define D_PV2_POWER       "PV2 Power"
 #define D_SOLAR_POWER     "Solar Power"
 #define D_INVERTER_POWER  "Inverter Power"
-#define D_WORKTIME        "Uptime"
 #define D_STATUS          "Status"
-#define D_UNIT_TEMPERATURE "°C"
-
-#define D_WAITING          "Waiting"
-#define D_CHECKING         "Checking"
-#define D_WORKING          "Working"
-#define D_FAILURE          "Failure"
-
-#define D_SOLAX_ERROR_0    "No Error Code"
-#define D_SOLAX_ERROR_1    "Grid Lost Fault"
-#define D_SOLAX_ERROR_2    "Grid Voltage Fault"
-#define D_SOLAX_ERROR_3    "Grid Frequency Fault"
-#define D_SOLAX_ERROR_4    "Pv Voltage Fault"
-#define D_SOLAX_ERROR_5    "Isolation Fault"
-#define D_SOLAX_ERROR_6    "Over Temperature Fault"
-#define D_SOLAX_ERROR_7    "Fan Fault"
-#define D_SOLAX_ERROR_8    "Other Device Fault"
-#endif
+#define D_WAITING         "Waiting"
+#define D_CHECKING        "Checking"
+#define D_WORKING         "Working"
+#define D_FAILURE         "Failure"
+#define D_SOLAX_ERROR_0   "No Error Code"
+#define D_SOLAX_ERROR_1   "Grid Lost Fault"
+#define D_SOLAX_ERROR_2   "Grid Voltage Fault"
+#define D_SOLAX_ERROR_3   "Grid Frequency Fault"
+#define D_SOLAX_ERROR_4   "Pv Voltage Fault"
+#define D_SOLAX_ERROR_5   "Isolation Fault"
+#define D_SOLAX_ERROR_6   "Over Temperature Fault"
+#define D_SOLAX_ERROR_7   "Fan Fault"
+#define D_SOLAX_ERROR_8   "Other Device Fault"
 
 #endif  // _LANGUAGE_DE_DE_H_
diff --git a/sonoff/language/el-GR.h b/sonoff/language/el-GR.h
index eadd3ab4e..d8c59320b 100644
--- a/sonoff/language/el-GR.h
+++ b/sonoff/language/el-GR.h
@@ -587,8 +587,8 @@
 #define D_SENSOR_ADE7953_IRQ   "ADE7953 IRQ"
 #define D_SENSOR_BUZZER        "Buzzer"
 #define D_SENSOR_OLED_RESET    "OLED Reset"
-#define D_SENSOR_SOLAXX1_TX    "SOLAXX1 Tx"
-#define D_SENSOR_SOLAXX1_RX    "SOLAXX1 Rx"
+#define D_SENSOR_SOLAXX1_TX    "SolaxX1 Tx"
+#define D_SENSOR_SOLAXX1_RX    "SolaxX1 Rx"
 
 // Units
 #define D_UNIT_AMPERE "A"
@@ -659,7 +659,6 @@
 #define D_UNIT_KWARH      "kVArh"
 #define D_UNIT_ANGLE      "Deg"
 
-#ifdef USE_SOLAX_X1
 //SOLAXX1
 #define D_PV1_VOLTAGE     "PV1 Voltage"
 #define D_PV1_CURRENT     "PV1 Current"
@@ -669,24 +668,19 @@
 #define D_PV2_POWER       "PV2 Power"
 #define D_SOLAR_POWER     "Solar Power"
 #define D_INVERTER_POWER  "Inverter Power"
-#define D_WORKTIME        "Uptime"
 #define D_STATUS          "Status"
-#define D_UNIT_TEMPERATURE "°C"
-
-#define D_WAITING          "Waiting"
-#define D_CHECKING         "Checking"
-#define D_WORKING          "Working"
-#define D_FAILURE          "Failure"
-
-#define D_SOLAX_ERROR_0    "No Error Code"
-#define D_SOLAX_ERROR_1    "Grid Lost Fault"
-#define D_SOLAX_ERROR_2    "Grid Voltage Fault"
-#define D_SOLAX_ERROR_3    "Grid Frequency Fault"
-#define D_SOLAX_ERROR_4    "Pv Voltage Fault"
-#define D_SOLAX_ERROR_5    "Isolation Fault"
-#define D_SOLAX_ERROR_6    "Over Temperature Fault"
-#define D_SOLAX_ERROR_7    "Fan Fault"
-#define D_SOLAX_ERROR_8    "Other Device Fault"
-#endif
+#define D_WAITING         "Waiting"
+#define D_CHECKING        "Checking"
+#define D_WORKING         "Working"
+#define D_FAILURE         "Failure"
+#define D_SOLAX_ERROR_0   "No Error Code"
+#define D_SOLAX_ERROR_1   "Grid Lost Fault"
+#define D_SOLAX_ERROR_2   "Grid Voltage Fault"
+#define D_SOLAX_ERROR_3   "Grid Frequency Fault"
+#define D_SOLAX_ERROR_4   "Pv Voltage Fault"
+#define D_SOLAX_ERROR_5   "Isolation Fault"
+#define D_SOLAX_ERROR_6   "Over Temperature Fault"
+#define D_SOLAX_ERROR_7   "Fan Fault"
+#define D_SOLAX_ERROR_8   "Other Device Fault"
 
 #endif  // _LANGUAGE_EL_GR_H_
diff --git a/sonoff/language/en-GB.h b/sonoff/language/en-GB.h
index 3aa8ba400..efccbdc89 100644
--- a/sonoff/language/en-GB.h
+++ b/sonoff/language/en-GB.h
@@ -587,8 +587,8 @@
 #define D_SENSOR_ADE7953_IRQ   "ADE7953 IRQ"
 #define D_SENSOR_BUZZER        "Buzzer"
 #define D_SENSOR_OLED_RESET    "OLED Reset"
-#define D_SENSOR_SOLAXX1_TX    "SOLAXX1 Tx"
-#define D_SENSOR_SOLAXX1_RX    "SOLAXX1 Rx"
+#define D_SENSOR_SOLAXX1_TX    "SolaxX1 Tx"
+#define D_SENSOR_SOLAXX1_RX    "SolaxX1 Rx"
 
 // Units
 #define D_UNIT_AMPERE "A"
@@ -659,7 +659,6 @@
 #define D_UNIT_KWARH      "kVArh"
 #define D_UNIT_ANGLE      "Deg"
 
-#ifdef USE_SOLAX_X1
 //SOLAXX1
 #define D_PV1_VOLTAGE     "PV1 Voltage"
 #define D_PV1_CURRENT     "PV1 Current"
@@ -669,24 +668,19 @@
 #define D_PV2_POWER       "PV2 Power"
 #define D_SOLAR_POWER     "Solar Power"
 #define D_INVERTER_POWER  "Inverter Power"
-#define D_WORKTIME        "Uptime"
 #define D_STATUS          "Status"
-#define D_UNIT_TEMPERATURE "°C"
-
-#define D_WAITING          "Waiting"
-#define D_CHECKING         "Checking"
-#define D_WORKING          "Working"
-#define D_FAILURE          "Failure"
-
-#define D_SOLAX_ERROR_0    "No Error Code"
-#define D_SOLAX_ERROR_1    "Grid Lost Fault"
-#define D_SOLAX_ERROR_2    "Grid Voltage Fault"
-#define D_SOLAX_ERROR_3    "Grid Frequency Fault"
-#define D_SOLAX_ERROR_4    "Pv Voltage Fault"
-#define D_SOLAX_ERROR_5    "Isolation Fault"
-#define D_SOLAX_ERROR_6    "Over Temperature Fault"
-#define D_SOLAX_ERROR_7    "Fan Fault"
-#define D_SOLAX_ERROR_8    "Other Device Fault"
-#endif
+#define D_WAITING         "Waiting"
+#define D_CHECKING        "Checking"
+#define D_WORKING         "Working"
+#define D_FAILURE         "Failure"
+#define D_SOLAX_ERROR_0   "No Error Code"
+#define D_SOLAX_ERROR_1   "Grid Lost Fault"
+#define D_SOLAX_ERROR_2   "Grid Voltage Fault"
+#define D_SOLAX_ERROR_3   "Grid Frequency Fault"
+#define D_SOLAX_ERROR_4   "Pv Voltage Fault"
+#define D_SOLAX_ERROR_5   "Isolation Fault"
+#define D_SOLAX_ERROR_6   "Over Temperature Fault"
+#define D_SOLAX_ERROR_7   "Fan Fault"
+#define D_SOLAX_ERROR_8   "Other Device Fault"
 
 #endif  // _LANGUAGE_EN_GB_H_
diff --git a/sonoff/language/es-ES.h b/sonoff/language/es-ES.h
index 242309ce1..bca6b4573 100644
--- a/sonoff/language/es-ES.h
+++ b/sonoff/language/es-ES.h
@@ -587,8 +587,8 @@
 #define D_SENSOR_ADE7953_IRQ   "ADE7953 IRQ"
 #define D_SENSOR_BUZZER        "Buzzer"
 #define D_SENSOR_OLED_RESET    "OLED Reset"
-#define D_SENSOR_SOLAXX1_TX    "SOLAXX1 Tx"
-#define D_SENSOR_SOLAXX1_RX    "SOLAXX1 Rx"
+#define D_SENSOR_SOLAXX1_TX    "SolaxX1 Tx"
+#define D_SENSOR_SOLAXX1_RX    "SolaxX1 Rx"
 
 // Units
 #define D_UNIT_AMPERE "A"
@@ -659,34 +659,28 @@
 #define D_UNIT_KWARH      "kVArH"
 #define D_UNIT_ANGLE      "Grados"
 
-#ifdef USE_SOLAX_X1
 //SOLAXX1
-#define D_PV1_VOLTAGE     "Voltaje PV1"
-#define D_PV1_CURRENT     "Intensidad PV1"
-#define D_PV1_POWER       "Potencia PV1"
-#define D_PV2_VOLTAGE     "Voltaje PV2"
-#define D_PV2_CURRENT     "Intensidad PV2"
-#define D_PV2_POWER       "Potencia PV2"
-#define D_SOLAR_POWER     "Potencia Solar"
-#define D_INVERTER_POWER  "Potencia Inverter"
-#define D_WORKTIME        "Horas en funcionamiento"
-#define D_STATUS          "Estado"
-#define D_UNIT_TEMPERATURE "°C"
-
-#define D_WAITING          "Esperando"
-#define D_CHECKING         "Comprobando"
-#define D_WORKING          "Funcionando"
-#define D_FAILURE          "Fallo"
-
-#define D_SOLAX_ERROR_0    "Sin fallos"
-#define D_SOLAX_ERROR_1    "Red Eléctrica Caída"
-#define D_SOLAX_ERROR_2    "Fallo en Voltaje de Red"
-#define D_SOLAX_ERROR_3    "Fallo en Frecuencia de Red"
-#define D_SOLAX_ERROR_4    "Fallo en Voltaje de Paneles"
-#define D_SOLAX_ERROR_5    "Fallo de Aislación"
-#define D_SOLAX_ERROR_6    "Fallo por Sobretemperatura"
-#define D_SOLAX_ERROR_7    "Fallo de Ventilador"
-#define D_SOLAX_ERROR_8    "Fallo en Otro Sistema"
-#endif
+#define D_PV1_VOLTAGE     "PV1 Voltage"
+#define D_PV1_CURRENT     "PV1 Current"
+#define D_PV1_POWER       "PV1 Power"
+#define D_PV2_VOLTAGE     "PV2 Voltage"
+#define D_PV2_CURRENT     "PV2 Current"
+#define D_PV2_POWER       "PV2 Power"
+#define D_SOLAR_POWER     "Solar Power"
+#define D_INVERTER_POWER  "Inverter Power"
+#define D_STATUS          "Status"
+#define D_WAITING         "Waiting"
+#define D_CHECKING        "Checking"
+#define D_WORKING         "Working"
+#define D_FAILURE         "Failure"
+#define D_SOLAX_ERROR_0   "No Error Code"
+#define D_SOLAX_ERROR_1   "Grid Lost Fault"
+#define D_SOLAX_ERROR_2   "Grid Voltage Fault"
+#define D_SOLAX_ERROR_3   "Grid Frequency Fault"
+#define D_SOLAX_ERROR_4   "Pv Voltage Fault"
+#define D_SOLAX_ERROR_5   "Isolation Fault"
+#define D_SOLAX_ERROR_6   "Over Temperature Fault"
+#define D_SOLAX_ERROR_7   "Fan Fault"
+#define D_SOLAX_ERROR_8   "Other Device Fault"
 
 #endif  // _LANGUAGE_ES_ES_H_
diff --git a/sonoff/language/fr-FR.h b/sonoff/language/fr-FR.h
index 185f851b1..ed198694c 100644
--- a/sonoff/language/fr-FR.h
+++ b/sonoff/language/fr-FR.h
@@ -587,8 +587,8 @@
 #define D_SENSOR_ADE7953_IRQ   "ADE7953 IRQ"
 #define D_SENSOR_BUZZER        "Buzzer"
 #define D_SENSOR_OLED_RESET    "OLED Reset"
-#define D_SENSOR_SOLAXX1_TX    "SOLAXX1 Tx"
-#define D_SENSOR_SOLAXX1_RX    "SOLAXX1 Rx"
+#define D_SENSOR_SOLAXX1_TX    "SolaxX1 Tx"
+#define D_SENSOR_SOLAXX1_RX    "SolaxX1 Rx"
 
 // Units
 #define D_UNIT_AMPERE "A"
@@ -659,7 +659,6 @@
 #define D_UNIT_KWARH      "kVArh"
 #define D_UNIT_ANGLE      "°"
 
-#ifdef USE_SOLAX_X1
 //SOLAXX1
 #define D_PV1_VOLTAGE     "PV1 Voltage"
 #define D_PV1_CURRENT     "PV1 Current"
@@ -669,24 +668,19 @@
 #define D_PV2_POWER       "PV2 Power"
 #define D_SOLAR_POWER     "Solar Power"
 #define D_INVERTER_POWER  "Inverter Power"
-#define D_WORKTIME        "Uptime"
 #define D_STATUS          "Status"
-#define D_UNIT_TEMPERATURE "°C"
-
-#define D_WAITING          "Waiting"
-#define D_CHECKING         "Checking"
-#define D_WORKING          "Working"
-#define D_FAILURE          "Failure"
-
-#define D_SOLAX_ERROR_0    "No Error Code"
-#define D_SOLAX_ERROR_1    "Grid Lost Fault"
-#define D_SOLAX_ERROR_2    "Grid Voltage Fault"
-#define D_SOLAX_ERROR_3    "Grid Frequency Fault"
-#define D_SOLAX_ERROR_4    "Pv Voltage Fault"
-#define D_SOLAX_ERROR_5    "Isolation Fault"
-#define D_SOLAX_ERROR_6    "Over Temperature Fault"
-#define D_SOLAX_ERROR_7    "Fan Fault"
-#define D_SOLAX_ERROR_8    "Other Device Fault"
-#endif
+#define D_WAITING         "Waiting"
+#define D_CHECKING        "Checking"
+#define D_WORKING         "Working"
+#define D_FAILURE         "Failure"
+#define D_SOLAX_ERROR_0   "No Error Code"
+#define D_SOLAX_ERROR_1   "Grid Lost Fault"
+#define D_SOLAX_ERROR_2   "Grid Voltage Fault"
+#define D_SOLAX_ERROR_3   "Grid Frequency Fault"
+#define D_SOLAX_ERROR_4   "Pv Voltage Fault"
+#define D_SOLAX_ERROR_5   "Isolation Fault"
+#define D_SOLAX_ERROR_6   "Over Temperature Fault"
+#define D_SOLAX_ERROR_7   "Fan Fault"
+#define D_SOLAX_ERROR_8   "Other Device Fault"
 
 #endif  // _LANGUAGE_FR_FR_H_
diff --git a/sonoff/language/he-HE.h b/sonoff/language/he-HE.h
index f99025fee..e4c4db427 100644
--- a/sonoff/language/he-HE.h
+++ b/sonoff/language/he-HE.h
@@ -587,8 +587,8 @@
 #define D_SENSOR_ADE7953_IRQ   "ADE7953 IRQ"
 #define D_SENSOR_BUZZER        "Buzzer"
 #define D_SENSOR_OLED_RESET    "OLED Reset"
-#define D_SENSOR_SOLAXX1_TX    "SOLAXX1 Tx"
-#define D_SENSOR_SOLAXX1_RX    "SOLAXX1 Rx"
+#define D_SENSOR_SOLAXX1_TX    "SolaxX1 Tx"
+#define D_SENSOR_SOLAXX1_RX    "SolaxX1 Rx"
 
 // Units
 #define D_UNIT_AMPERE "A"
@@ -659,7 +659,6 @@
 #define D_UNIT_KWARH      "kVArh"
 #define D_UNIT_ANGLE      "Deg"
 
-#ifdef USE_SOLAX_X1
 //SOLAXX1
 #define D_PV1_VOLTAGE     "PV1 Voltage"
 #define D_PV1_CURRENT     "PV1 Current"
@@ -669,24 +668,19 @@
 #define D_PV2_POWER       "PV2 Power"
 #define D_SOLAR_POWER     "Solar Power"
 #define D_INVERTER_POWER  "Inverter Power"
-#define D_WORKTIME        "Uptime"
 #define D_STATUS          "Status"
-#define D_UNIT_TEMPERATURE "°C"
-
-#define D_WAITING          "Waiting"
-#define D_CHECKING         "Checking"
-#define D_WORKING          "Working"
-#define D_FAILURE          "Failure"
-
-#define D_SOLAX_ERROR_0    "No Error Code"
-#define D_SOLAX_ERROR_1    "Grid Lost Fault"
-#define D_SOLAX_ERROR_2    "Grid Voltage Fault"
-#define D_SOLAX_ERROR_3    "Grid Frequency Fault"
-#define D_SOLAX_ERROR_4    "Pv Voltage Fault"
-#define D_SOLAX_ERROR_5    "Isolation Fault"
-#define D_SOLAX_ERROR_6    "Over Temperature Fault"
-#define D_SOLAX_ERROR_7    "Fan Fault"
-#define D_SOLAX_ERROR_8    "Other Device Fault"
-#endif
+#define D_WAITING         "Waiting"
+#define D_CHECKING        "Checking"
+#define D_WORKING         "Working"
+#define D_FAILURE         "Failure"
+#define D_SOLAX_ERROR_0   "No Error Code"
+#define D_SOLAX_ERROR_1   "Grid Lost Fault"
+#define D_SOLAX_ERROR_2   "Grid Voltage Fault"
+#define D_SOLAX_ERROR_3   "Grid Frequency Fault"
+#define D_SOLAX_ERROR_4   "Pv Voltage Fault"
+#define D_SOLAX_ERROR_5   "Isolation Fault"
+#define D_SOLAX_ERROR_6   "Over Temperature Fault"
+#define D_SOLAX_ERROR_7   "Fan Fault"
+#define D_SOLAX_ERROR_8   "Other Device Fault"
 
 #endif  // _LANGUAGE_HE_HE_H_
diff --git a/sonoff/language/hu-HU.h b/sonoff/language/hu-HU.h
index e94e9c45e..4ee7aceb3 100644
--- a/sonoff/language/hu-HU.h
+++ b/sonoff/language/hu-HU.h
@@ -587,8 +587,8 @@
 #define D_SENSOR_ADE7953_IRQ   "ADE7953 IRQ"
 #define D_SENSOR_BUZZER        "Buzzer"
 #define D_SENSOR_OLED_RESET    "OLED Reset"
-#define D_SENSOR_SOLAXX1_TX    "SOLAXX1 Tx"
-#define D_SENSOR_SOLAXX1_RX    "SOLAXX1 Rx"
+#define D_SENSOR_SOLAXX1_TX    "SolaxX1 Tx"
+#define D_SENSOR_SOLAXX1_RX    "SolaxX1 Rx"
 
 // Units
 #define D_UNIT_AMPERE "A"
@@ -659,7 +659,6 @@
 #define D_UNIT_KWARH      "kVArh"
 #define D_UNIT_ANGLE      "fok"
 
-#ifdef USE_SOLAX_X1
 //SOLAXX1
 #define D_PV1_VOLTAGE     "PV1 Voltage"
 #define D_PV1_CURRENT     "PV1 Current"
@@ -669,24 +668,19 @@
 #define D_PV2_POWER       "PV2 Power"
 #define D_SOLAR_POWER     "Solar Power"
 #define D_INVERTER_POWER  "Inverter Power"
-#define D_WORKTIME        "Uptime"
 #define D_STATUS          "Status"
-#define D_UNIT_TEMPERATURE "°C"
-
-#define D_WAITING          "Waiting"
-#define D_CHECKING         "Checking"
-#define D_WORKING          "Working"
-#define D_FAILURE          "Failure"
-
-#define D_SOLAX_ERROR_0    "No Error Code"
-#define D_SOLAX_ERROR_1    "Grid Lost Fault"
-#define D_SOLAX_ERROR_2    "Grid Voltage Fault"
-#define D_SOLAX_ERROR_3    "Grid Frequency Fault"
-#define D_SOLAX_ERROR_4    "Pv Voltage Fault"
-#define D_SOLAX_ERROR_5    "Isolation Fault"
-#define D_SOLAX_ERROR_6    "Over Temperature Fault"
-#define D_SOLAX_ERROR_7    "Fan Fault"
-#define D_SOLAX_ERROR_8    "Other Device Fault"
-#endif
+#define D_WAITING         "Waiting"
+#define D_CHECKING        "Checking"
+#define D_WORKING         "Working"
+#define D_FAILURE         "Failure"
+#define D_SOLAX_ERROR_0   "No Error Code"
+#define D_SOLAX_ERROR_1   "Grid Lost Fault"
+#define D_SOLAX_ERROR_2   "Grid Voltage Fault"
+#define D_SOLAX_ERROR_3   "Grid Frequency Fault"
+#define D_SOLAX_ERROR_4   "Pv Voltage Fault"
+#define D_SOLAX_ERROR_5   "Isolation Fault"
+#define D_SOLAX_ERROR_6   "Over Temperature Fault"
+#define D_SOLAX_ERROR_7   "Fan Fault"
+#define D_SOLAX_ERROR_8   "Other Device Fault"
 
 #endif  // _LANGUAGE_HU_HU_H_
diff --git a/sonoff/language/it-IT.h b/sonoff/language/it-IT.h
index ce960a434..572d81afb 100644
--- a/sonoff/language/it-IT.h
+++ b/sonoff/language/it-IT.h
@@ -587,8 +587,8 @@
 #define D_SENSOR_ADE7953_IRQ   "ADE7953 IRQ"
 #define D_SENSOR_BUZZER        "Buzzer"
 #define D_SENSOR_OLED_RESET    "OLED Reset"
-#define D_SENSOR_SOLAXX1_TX    "SOLAXX1 Tx"
-#define D_SENSOR_SOLAXX1_RX    "SOLAXX1 Rx"
+#define D_SENSOR_SOLAXX1_TX    "SolaxX1 Tx"
+#define D_SENSOR_SOLAXX1_RX    "SolaxX1 Rx"
 
 // Units
 #define D_UNIT_AMPERE "A"
@@ -659,7 +659,6 @@
 #define D_UNIT_KWARH      "kVArh"
 #define D_UNIT_ANGLE      "°"
 
-#ifdef USE_SOLAX_X1
 //SOLAXX1
 #define D_PV1_VOLTAGE     "PV1 Voltage"
 #define D_PV1_CURRENT     "PV1 Current"
@@ -669,24 +668,19 @@
 #define D_PV2_POWER       "PV2 Power"
 #define D_SOLAR_POWER     "Solar Power"
 #define D_INVERTER_POWER  "Inverter Power"
-#define D_WORKTIME        "Uptime"
 #define D_STATUS          "Status"
-#define D_UNIT_TEMPERATURE "°C"
-
-#define D_WAITING          "Waiting"
-#define D_CHECKING         "Checking"
-#define D_WORKING          "Working"
-#define D_FAILURE          "Failure"
-
-#define D_SOLAX_ERROR_0    "No Error Code"
-#define D_SOLAX_ERROR_1    "Grid Lost Fault"
-#define D_SOLAX_ERROR_2    "Grid Voltage Fault"
-#define D_SOLAX_ERROR_3    "Grid Frequency Fault"
-#define D_SOLAX_ERROR_4    "Pv Voltage Fault"
-#define D_SOLAX_ERROR_5    "Isolation Fault"
-#define D_SOLAX_ERROR_6    "Over Temperature Fault"
-#define D_SOLAX_ERROR_7    "Fan Fault"
-#define D_SOLAX_ERROR_8    "Other Device Fault"
-#endif
+#define D_WAITING         "Waiting"
+#define D_CHECKING        "Checking"
+#define D_WORKING         "Working"
+#define D_FAILURE         "Failure"
+#define D_SOLAX_ERROR_0   "No Error Code"
+#define D_SOLAX_ERROR_1   "Grid Lost Fault"
+#define D_SOLAX_ERROR_2   "Grid Voltage Fault"
+#define D_SOLAX_ERROR_3   "Grid Frequency Fault"
+#define D_SOLAX_ERROR_4   "Pv Voltage Fault"
+#define D_SOLAX_ERROR_5   "Isolation Fault"
+#define D_SOLAX_ERROR_6   "Over Temperature Fault"
+#define D_SOLAX_ERROR_7   "Fan Fault"
+#define D_SOLAX_ERROR_8   "Other Device Fault"
 
 #endif  // _LANGUAGE_IT_IT_H_
diff --git a/sonoff/language/ko-KO.h b/sonoff/language/ko-KO.h
index 26c8aa199..cfe29d7b9 100644
--- a/sonoff/language/ko-KO.h
+++ b/sonoff/language/ko-KO.h
@@ -587,8 +587,8 @@
 #define D_SENSOR_ADE7953_IRQ   "ADE7953 IRQ"
 #define D_SENSOR_BUZZER        "Buzzer"
 #define D_SENSOR_OLED_RESET    "OLED Reset"
-#define D_SENSOR_SOLAXX1_TX    "SOLAXX1 Tx"
-#define D_SENSOR_SOLAXX1_RX    "SOLAXX1 Rx"
+#define D_SENSOR_SOLAXX1_TX    "SolaxX1 Tx"
+#define D_SENSOR_SOLAXX1_RX    "SolaxX1 Rx"
 
 // Units
 #define D_UNIT_AMPERE "A"
@@ -659,7 +659,6 @@
 #define D_UNIT_KWARH      "kVArh"
 #define D_UNIT_ANGLE      "Deg"
 
-#ifdef USE_SOLAX_X1
 //SOLAXX1
 #define D_PV1_VOLTAGE     "PV1 Voltage"
 #define D_PV1_CURRENT     "PV1 Current"
@@ -669,24 +668,19 @@
 #define D_PV2_POWER       "PV2 Power"
 #define D_SOLAR_POWER     "Solar Power"
 #define D_INVERTER_POWER  "Inverter Power"
-#define D_WORKTIME        "Uptime"
 #define D_STATUS          "Status"
-#define D_UNIT_TEMPERATURE "°C"
-
-#define D_WAITING          "Waiting"
-#define D_CHECKING         "Checking"
-#define D_WORKING          "Working"
-#define D_FAILURE          "Failure"
-
-#define D_SOLAX_ERROR_0    "No Error Code"
-#define D_SOLAX_ERROR_1    "Grid Lost Fault"
-#define D_SOLAX_ERROR_2    "Grid Voltage Fault"
-#define D_SOLAX_ERROR_3    "Grid Frequency Fault"
-#define D_SOLAX_ERROR_4    "Pv Voltage Fault"
-#define D_SOLAX_ERROR_5    "Isolation Fault"
-#define D_SOLAX_ERROR_6    "Over Temperature Fault"
-#define D_SOLAX_ERROR_7    "Fan Fault"
-#define D_SOLAX_ERROR_8    "Other Device Fault"
-#endif
+#define D_WAITING         "Waiting"
+#define D_CHECKING        "Checking"
+#define D_WORKING         "Working"
+#define D_FAILURE         "Failure"
+#define D_SOLAX_ERROR_0   "No Error Code"
+#define D_SOLAX_ERROR_1   "Grid Lost Fault"
+#define D_SOLAX_ERROR_2   "Grid Voltage Fault"
+#define D_SOLAX_ERROR_3   "Grid Frequency Fault"
+#define D_SOLAX_ERROR_4   "Pv Voltage Fault"
+#define D_SOLAX_ERROR_5   "Isolation Fault"
+#define D_SOLAX_ERROR_6   "Over Temperature Fault"
+#define D_SOLAX_ERROR_7   "Fan Fault"
+#define D_SOLAX_ERROR_8   "Other Device Fault"
 
 #endif  // _LANGUAGE_KO_KO_H_
diff --git a/sonoff/language/nl-NL.h b/sonoff/language/nl-NL.h
index b45f2aa21..b2e4f77c6 100644
--- a/sonoff/language/nl-NL.h
+++ b/sonoff/language/nl-NL.h
@@ -587,8 +587,8 @@
 #define D_SENSOR_ADE7953_IRQ   "ADE7953 IRQ"
 #define D_SENSOR_BUZZER        "Zoemer"
 #define D_SENSOR_OLED_RESET    "OLED Reset"
-#define D_SENSOR_SOLAXX1_TX    "SOLAXX1 Tx"
-#define D_SENSOR_SOLAXX1_RX    "SOLAXX1 Rx"
+#define D_SENSOR_SOLAXX1_TX    "SolaxX1 Tx"
+#define D_SENSOR_SOLAXX1_RX    "SolaxX1 Rx"
 
 // Units
 #define D_UNIT_AMPERE "A"
@@ -659,7 +659,6 @@
 #define D_UNIT_KWARH      "kVArh"
 #define D_UNIT_ANGLE      "Deg"
 
-#ifdef USE_SOLAX_X1
 //SOLAXX1
 #define D_PV1_VOLTAGE     "PV1 Voltage"
 #define D_PV1_CURRENT     "PV1 Current"
@@ -669,24 +668,19 @@
 #define D_PV2_POWER       "PV2 Power"
 #define D_SOLAR_POWER     "Solar Power"
 #define D_INVERTER_POWER  "Inverter Power"
-#define D_WORKTIME        "Uptime"
 #define D_STATUS          "Status"
-#define D_UNIT_TEMPERATURE "°C"
-
-#define D_WAITING          "Waiting"
-#define D_CHECKING         "Checking"
-#define D_WORKING          "Working"
-#define D_FAILURE          "Failure"
-
-#define D_SOLAX_ERROR_0    "No Error Code"
-#define D_SOLAX_ERROR_1    "Grid Lost Fault"
-#define D_SOLAX_ERROR_2    "Grid Voltage Fault"
-#define D_SOLAX_ERROR_3    "Grid Frequency Fault"
-#define D_SOLAX_ERROR_4    "Pv Voltage Fault"
-#define D_SOLAX_ERROR_5    "Isolation Fault"
-#define D_SOLAX_ERROR_6    "Over Temperature Fault"
-#define D_SOLAX_ERROR_7    "Fan Fault"
-#define D_SOLAX_ERROR_8    "Other Device Fault"
-#endif
+#define D_WAITING         "Waiting"
+#define D_CHECKING        "Checking"
+#define D_WORKING         "Working"
+#define D_FAILURE         "Failure"
+#define D_SOLAX_ERROR_0   "No Error Code"
+#define D_SOLAX_ERROR_1   "Grid Lost Fault"
+#define D_SOLAX_ERROR_2   "Grid Voltage Fault"
+#define D_SOLAX_ERROR_3   "Grid Frequency Fault"
+#define D_SOLAX_ERROR_4   "Pv Voltage Fault"
+#define D_SOLAX_ERROR_5   "Isolation Fault"
+#define D_SOLAX_ERROR_6   "Over Temperature Fault"
+#define D_SOLAX_ERROR_7   "Fan Fault"
+#define D_SOLAX_ERROR_8   "Other Device Fault"
 
 #endif  // _LANGUAGE_NL_NL_H_
diff --git a/sonoff/language/pl-PL.h b/sonoff/language/pl-PL.h
index 9822ace8b..6d69b120b 100644
--- a/sonoff/language/pl-PL.h
+++ b/sonoff/language/pl-PL.h
@@ -587,8 +587,8 @@
 #define D_SENSOR_ADE7953_IRQ   "ADE7953 IRQ"
 #define D_SENSOR_BUZZER        "Buzzer"
 #define D_SENSOR_OLED_RESET    "OLED Reset"
-#define D_SENSOR_SOLAXX1_TX    "SOLAXX1 Tx"
-#define D_SENSOR_SOLAXX1_RX    "SOLAXX1 Rx"
+#define D_SENSOR_SOLAXX1_TX    "SolaxX1 Tx"
+#define D_SENSOR_SOLAXX1_RX    "SolaxX1 Rx"
 
 // Units
 #define D_UNIT_AMPERE "A"
@@ -659,7 +659,6 @@
 #define D_UNIT_KWARH      "kVArh"
 #define D_UNIT_ANGLE      "Deg"
 
-#ifdef USE_SOLAX_X1
 //SOLAXX1
 #define D_PV1_VOLTAGE     "PV1 Voltage"
 #define D_PV1_CURRENT     "PV1 Current"
@@ -669,24 +668,19 @@
 #define D_PV2_POWER       "PV2 Power"
 #define D_SOLAR_POWER     "Solar Power"
 #define D_INVERTER_POWER  "Inverter Power"
-#define D_WORKTIME        "Uptime"
 #define D_STATUS          "Status"
-#define D_UNIT_TEMPERATURE "°C"
-
-#define D_WAITING          "Waiting"
-#define D_CHECKING         "Checking"
-#define D_WORKING          "Working"
-#define D_FAILURE          "Failure"
-
-#define D_SOLAX_ERROR_0    "No Error Code"
-#define D_SOLAX_ERROR_1    "Grid Lost Fault"
-#define D_SOLAX_ERROR_2    "Grid Voltage Fault"
-#define D_SOLAX_ERROR_3    "Grid Frequency Fault"
-#define D_SOLAX_ERROR_4    "Pv Voltage Fault"
-#define D_SOLAX_ERROR_5    "Isolation Fault"
-#define D_SOLAX_ERROR_6    "Over Temperature Fault"
-#define D_SOLAX_ERROR_7    "Fan Fault"
-#define D_SOLAX_ERROR_8    "Other Device Fault"
-#endif
+#define D_WAITING         "Waiting"
+#define D_CHECKING        "Checking"
+#define D_WORKING         "Working"
+#define D_FAILURE         "Failure"
+#define D_SOLAX_ERROR_0   "No Error Code"
+#define D_SOLAX_ERROR_1   "Grid Lost Fault"
+#define D_SOLAX_ERROR_2   "Grid Voltage Fault"
+#define D_SOLAX_ERROR_3   "Grid Frequency Fault"
+#define D_SOLAX_ERROR_4   "Pv Voltage Fault"
+#define D_SOLAX_ERROR_5   "Isolation Fault"
+#define D_SOLAX_ERROR_6   "Over Temperature Fault"
+#define D_SOLAX_ERROR_7   "Fan Fault"
+#define D_SOLAX_ERROR_8   "Other Device Fault"
 
 #endif  // _LANGUAGE_PL_PL_D_H_
diff --git a/sonoff/language/pt-BR.h b/sonoff/language/pt-BR.h
index 05ffc6a43..ed33302ba 100644
--- a/sonoff/language/pt-BR.h
+++ b/sonoff/language/pt-BR.h
@@ -587,8 +587,8 @@
 #define D_SENSOR_ADE7953_IRQ   "ADE7953 IRQ"
 #define D_SENSOR_BUZZER        "Buzzer"
 #define D_SENSOR_OLED_RESET    "OLED Reset"
-#define D_SENSOR_SOLAXX1_TX    "SOLAXX1 Tx"
-#define D_SENSOR_SOLAXX1_RX    "SOLAXX1 Rx"
+#define D_SENSOR_SOLAXX1_TX    "SolaxX1 Tx"
+#define D_SENSOR_SOLAXX1_RX    "SolaxX1 Rx"
 
 // Units
 #define D_UNIT_AMPERE "A"
@@ -659,7 +659,6 @@
 #define D_UNIT_KWARH      "kVArh"
 #define D_UNIT_ANGLE      "Deg"
 
-#ifdef USE_SOLAX_X1
 //SOLAXX1
 #define D_PV1_VOLTAGE     "PV1 Voltage"
 #define D_PV1_CURRENT     "PV1 Current"
@@ -669,24 +668,19 @@
 #define D_PV2_POWER       "PV2 Power"
 #define D_SOLAR_POWER     "Solar Power"
 #define D_INVERTER_POWER  "Inverter Power"
-#define D_WORKTIME        "Uptime"
 #define D_STATUS          "Status"
-#define D_UNIT_TEMPERATURE "°C"
-
-#define D_WAITING          "Waiting"
-#define D_CHECKING         "Checking"
-#define D_WORKING          "Working"
-#define D_FAILURE          "Failure"
-
-#define D_SOLAX_ERROR_0    "No Error Code"
-#define D_SOLAX_ERROR_1    "Grid Lost Fault"
-#define D_SOLAX_ERROR_2    "Grid Voltage Fault"
-#define D_SOLAX_ERROR_3    "Grid Frequency Fault"
-#define D_SOLAX_ERROR_4    "Pv Voltage Fault"
-#define D_SOLAX_ERROR_5    "Isolation Fault"
-#define D_SOLAX_ERROR_6    "Over Temperature Fault"
-#define D_SOLAX_ERROR_7    "Fan Fault"
-#define D_SOLAX_ERROR_8    "Other Device Fault"
-#endif
+#define D_WAITING         "Waiting"
+#define D_CHECKING        "Checking"
+#define D_WORKING         "Working"
+#define D_FAILURE         "Failure"
+#define D_SOLAX_ERROR_0   "No Error Code"
+#define D_SOLAX_ERROR_1   "Grid Lost Fault"
+#define D_SOLAX_ERROR_2   "Grid Voltage Fault"
+#define D_SOLAX_ERROR_3   "Grid Frequency Fault"
+#define D_SOLAX_ERROR_4   "Pv Voltage Fault"
+#define D_SOLAX_ERROR_5   "Isolation Fault"
+#define D_SOLAX_ERROR_6   "Over Temperature Fault"
+#define D_SOLAX_ERROR_7   "Fan Fault"
+#define D_SOLAX_ERROR_8   "Other Device Fault"
 
 #endif  // _LANGUAGE_PT_BR_H_
diff --git a/sonoff/language/pt-PT.h b/sonoff/language/pt-PT.h
index 56623d542..c9639b6b0 100644
--- a/sonoff/language/pt-PT.h
+++ b/sonoff/language/pt-PT.h
@@ -587,8 +587,8 @@
 #define D_SENSOR_ADE7953_IRQ   "ADE7953 IRQ"
 #define D_SENSOR_BUZZER        "Buzzer"
 #define D_SENSOR_OLED_RESET    "OLED Reset"
-#define D_SENSOR_SOLAXX1_TX    "SOLAXX1 Tx"
-#define D_SENSOR_SOLAXX1_RX    "SOLAXX1 Rx"
+#define D_SENSOR_SOLAXX1_TX    "SolaxX1 Tx"
+#define D_SENSOR_SOLAXX1_RX    "SolaxX1 Rx"
 
 // Units
 #define D_UNIT_AMPERE "A"
@@ -659,7 +659,6 @@
 #define D_UNIT_KWARH      "kVArh"
 #define D_UNIT_ANGLE      "Deg"
 
-#ifdef USE_SOLAX_X1
 //SOLAXX1
 #define D_PV1_VOLTAGE     "PV1 Voltage"
 #define D_PV1_CURRENT     "PV1 Current"
@@ -669,24 +668,19 @@
 #define D_PV2_POWER       "PV2 Power"
 #define D_SOLAR_POWER     "Solar Power"
 #define D_INVERTER_POWER  "Inverter Power"
-#define D_WORKTIME        "Uptime"
 #define D_STATUS          "Status"
-#define D_UNIT_TEMPERATURE "°C"
-
-#define D_WAITING          "Waiting"
-#define D_CHECKING         "Checking"
-#define D_WORKING          "Working"
-#define D_FAILURE          "Failure"
-
-#define D_SOLAX_ERROR_0    "No Error Code"
-#define D_SOLAX_ERROR_1    "Grid Lost Fault"
-#define D_SOLAX_ERROR_2    "Grid Voltage Fault"
-#define D_SOLAX_ERROR_3    "Grid Frequency Fault"
-#define D_SOLAX_ERROR_4    "Pv Voltage Fault"
-#define D_SOLAX_ERROR_5    "Isolation Fault"
-#define D_SOLAX_ERROR_6    "Over Temperature Fault"
-#define D_SOLAX_ERROR_7    "Fan Fault"
-#define D_SOLAX_ERROR_8    "Other Device Fault"
-#endif
+#define D_WAITING         "Waiting"
+#define D_CHECKING        "Checking"
+#define D_WORKING         "Working"
+#define D_FAILURE         "Failure"
+#define D_SOLAX_ERROR_0   "No Error Code"
+#define D_SOLAX_ERROR_1   "Grid Lost Fault"
+#define D_SOLAX_ERROR_2   "Grid Voltage Fault"
+#define D_SOLAX_ERROR_3   "Grid Frequency Fault"
+#define D_SOLAX_ERROR_4   "Pv Voltage Fault"
+#define D_SOLAX_ERROR_5   "Isolation Fault"
+#define D_SOLAX_ERROR_6   "Over Temperature Fault"
+#define D_SOLAX_ERROR_7   "Fan Fault"
+#define D_SOLAX_ERROR_8   "Other Device Fault"
 
 #endif  // _LANGUAGE_PT_PT_H_
diff --git a/sonoff/language/ru-RU.h b/sonoff/language/ru-RU.h
index c8bd87b72..3089f748f 100644
--- a/sonoff/language/ru-RU.h
+++ b/sonoff/language/ru-RU.h
@@ -587,8 +587,8 @@
 #define D_SENSOR_ADE7953_IRQ   "ADE7953 IRQ"
 #define D_SENSOR_BUZZER        "Buzzer"
 #define D_SENSOR_OLED_RESET    "OLED Reset"
-#define D_SENSOR_SOLAXX1_TX    "SOLAXX1 Tx"
-#define D_SENSOR_SOLAXX1_RX    "SOLAXX1 Rx"
+#define D_SENSOR_SOLAXX1_TX    "SolaxX1 Tx"
+#define D_SENSOR_SOLAXX1_RX    "SolaxX1 Rx"
 
 // Units
 #define D_UNIT_AMPERE "А"
@@ -659,7 +659,6 @@
 #define D_UNIT_KWARH      "kVArh"
 #define D_UNIT_ANGLE      "Град"
 
-#ifdef USE_SOLAX_X1
 //SOLAXX1
 #define D_PV1_VOLTAGE     "PV1 Voltage"
 #define D_PV1_CURRENT     "PV1 Current"
@@ -669,24 +668,19 @@
 #define D_PV2_POWER       "PV2 Power"
 #define D_SOLAR_POWER     "Solar Power"
 #define D_INVERTER_POWER  "Inverter Power"
-#define D_WORKTIME        "Uptime"
 #define D_STATUS          "Status"
-#define D_UNIT_TEMPERATURE "°C"
-
-#define D_WAITING          "Waiting"
-#define D_CHECKING         "Checking"
-#define D_WORKING          "Working"
-#define D_FAILURE          "Failure"
-
-#define D_SOLAX_ERROR_0    "No Error Code"
-#define D_SOLAX_ERROR_1    "Grid Lost Fault"
-#define D_SOLAX_ERROR_2    "Grid Voltage Fault"
-#define D_SOLAX_ERROR_3    "Grid Frequency Fault"
-#define D_SOLAX_ERROR_4    "Pv Voltage Fault"
-#define D_SOLAX_ERROR_5    "Isolation Fault"
-#define D_SOLAX_ERROR_6    "Over Temperature Fault"
-#define D_SOLAX_ERROR_7    "Fan Fault"
-#define D_SOLAX_ERROR_8    "Other Device Fault"
-#endif
+#define D_WAITING         "Waiting"
+#define D_CHECKING        "Checking"
+#define D_WORKING         "Working"
+#define D_FAILURE         "Failure"
+#define D_SOLAX_ERROR_0   "No Error Code"
+#define D_SOLAX_ERROR_1   "Grid Lost Fault"
+#define D_SOLAX_ERROR_2   "Grid Voltage Fault"
+#define D_SOLAX_ERROR_3   "Grid Frequency Fault"
+#define D_SOLAX_ERROR_4   "Pv Voltage Fault"
+#define D_SOLAX_ERROR_5   "Isolation Fault"
+#define D_SOLAX_ERROR_6   "Over Temperature Fault"
+#define D_SOLAX_ERROR_7   "Fan Fault"
+#define D_SOLAX_ERROR_8   "Other Device Fault"
 
 #endif  // _LANGUAGE_RU_RU_H_
diff --git a/sonoff/language/sk-SK.h b/sonoff/language/sk-SK.h
index 214f3765e..8fd0d7380 100644
--- a/sonoff/language/sk-SK.h
+++ b/sonoff/language/sk-SK.h
@@ -587,8 +587,8 @@
 #define D_SENSOR_ADE7953_IRQ   "ADE7953 IRQ"
 #define D_SENSOR_BUZZER        "Buzzer"
 #define D_SENSOR_OLED_RESET    "OLED Reset"
-#define D_SENSOR_SOLAXX1_TX    "SOLAXX1 Tx"
-#define D_SENSOR_SOLAXX1_RX    "SOLAXX1 Rx"
+#define D_SENSOR_SOLAXX1_TX    "SolaxX1 Tx"
+#define D_SENSOR_SOLAXX1_RX    "SolaxX1 Rx"
 
 // Units
 #define D_UNIT_AMPERE "A"
@@ -659,7 +659,6 @@
 #define D_UNIT_KWARH      "kVArh"
 #define D_UNIT_ANGLE      "Deg"
 
-#ifdef USE_SOLAX_X1
 //SOLAXX1
 #define D_PV1_VOLTAGE     "PV1 Voltage"
 #define D_PV1_CURRENT     "PV1 Current"
@@ -669,24 +668,19 @@
 #define D_PV2_POWER       "PV2 Power"
 #define D_SOLAR_POWER     "Solar Power"
 #define D_INVERTER_POWER  "Inverter Power"
-#define D_WORKTIME        "Uptime"
 #define D_STATUS          "Status"
-#define D_UNIT_TEMPERATURE "°C"
-
-#define D_WAITING          "Waiting"
-#define D_CHECKING         "Checking"
-#define D_WORKING          "Working"
-#define D_FAILURE          "Failure"
-
-#define D_SOLAX_ERROR_0    "No Error Code"
-#define D_SOLAX_ERROR_1    "Grid Lost Fault"
-#define D_SOLAX_ERROR_2    "Grid Voltage Fault"
-#define D_SOLAX_ERROR_3    "Grid Frequency Fault"
-#define D_SOLAX_ERROR_4    "Pv Voltage Fault"
-#define D_SOLAX_ERROR_5    "Isolation Fault"
-#define D_SOLAX_ERROR_6    "Over Temperature Fault"
-#define D_SOLAX_ERROR_7    "Fan Fault"
-#define D_SOLAX_ERROR_8    "Other Device Fault"
-#endif
+#define D_WAITING         "Waiting"
+#define D_CHECKING        "Checking"
+#define D_WORKING         "Working"
+#define D_FAILURE         "Failure"
+#define D_SOLAX_ERROR_0   "No Error Code"
+#define D_SOLAX_ERROR_1   "Grid Lost Fault"
+#define D_SOLAX_ERROR_2   "Grid Voltage Fault"
+#define D_SOLAX_ERROR_3   "Grid Frequency Fault"
+#define D_SOLAX_ERROR_4   "Pv Voltage Fault"
+#define D_SOLAX_ERROR_5   "Isolation Fault"
+#define D_SOLAX_ERROR_6   "Over Temperature Fault"
+#define D_SOLAX_ERROR_7   "Fan Fault"
+#define D_SOLAX_ERROR_8   "Other Device Fault"
 
 #endif  // _LANGUAGE_SK_SK_H_
diff --git a/sonoff/language/sv-SE.h b/sonoff/language/sv-SE.h
index a098aac8d..e3a50b112 100644
--- a/sonoff/language/sv-SE.h
+++ b/sonoff/language/sv-SE.h
@@ -587,8 +587,8 @@
 #define D_SENSOR_ADE7953_IRQ   "ADE7953 IRQ"
 #define D_SENSOR_BUZZER        "Buzzer"
 #define D_SENSOR_OLED_RESET    "OLED Reset"
-#define D_SENSOR_SOLAXX1_TX    "SOLAXX1 Tx"
-#define D_SENSOR_SOLAXX1_RX    "SOLAXX1 Rx"
+#define D_SENSOR_SOLAXX1_TX    "SolaxX1 Tx"
+#define D_SENSOR_SOLAXX1_RX    "SolaxX1 Rx"
 
 // Units
 #define D_UNIT_AMPERE "A"
@@ -659,7 +659,6 @@
 #define D_UNIT_KWARH      "kVArh"
 #define D_UNIT_ANGLE      "Deg"
 
-#ifdef USE_SOLAX_X1
 //SOLAXX1
 #define D_PV1_VOLTAGE     "PV1 Voltage"
 #define D_PV1_CURRENT     "PV1 Current"
@@ -669,24 +668,19 @@
 #define D_PV2_POWER       "PV2 Power"
 #define D_SOLAR_POWER     "Solar Power"
 #define D_INVERTER_POWER  "Inverter Power"
-#define D_WORKTIME        "Uptime"
 #define D_STATUS          "Status"
-#define D_UNIT_TEMPERATURE "°C"
-
-#define D_WAITING          "Waiting"
-#define D_CHECKING         "Checking"
-#define D_WORKING          "Working"
-#define D_FAILURE          "Failure"
-
-#define D_SOLAX_ERROR_0    "No Error Code"
-#define D_SOLAX_ERROR_1    "Grid Lost Fault"
-#define D_SOLAX_ERROR_2    "Grid Voltage Fault"
-#define D_SOLAX_ERROR_3    "Grid Frequency Fault"
-#define D_SOLAX_ERROR_4    "Pv Voltage Fault"
-#define D_SOLAX_ERROR_5    "Isolation Fault"
-#define D_SOLAX_ERROR_6    "Over Temperature Fault"
-#define D_SOLAX_ERROR_7    "Fan Fault"
-#define D_SOLAX_ERROR_8    "Other Device Fault"
-#endif
+#define D_WAITING         "Waiting"
+#define D_CHECKING        "Checking"
+#define D_WORKING         "Working"
+#define D_FAILURE         "Failure"
+#define D_SOLAX_ERROR_0   "No Error Code"
+#define D_SOLAX_ERROR_1   "Grid Lost Fault"
+#define D_SOLAX_ERROR_2   "Grid Voltage Fault"
+#define D_SOLAX_ERROR_3   "Grid Frequency Fault"
+#define D_SOLAX_ERROR_4   "Pv Voltage Fault"
+#define D_SOLAX_ERROR_5   "Isolation Fault"
+#define D_SOLAX_ERROR_6   "Over Temperature Fault"
+#define D_SOLAX_ERROR_7   "Fan Fault"
+#define D_SOLAX_ERROR_8   "Other Device Fault"
 
 #endif  // _LANGUAGE_SV_SE_H_
diff --git a/sonoff/language/tr-TR.h b/sonoff/language/tr-TR.h
index f5ccd75ee..6542f7bdb 100755
--- a/sonoff/language/tr-TR.h
+++ b/sonoff/language/tr-TR.h
@@ -587,8 +587,8 @@
 #define D_SENSOR_ADE7953_IRQ   "ADE7953 IRQ"
 #define D_SENSOR_BUZZER        "Buzzer"
 #define D_SENSOR_OLED_RESET    "OLED Reset"
-#define D_SENSOR_SOLAXX1_TX    "SOLAXX1 Tx"
-#define D_SENSOR_SOLAXX1_RX    "SOLAXX1 Rx"
+#define D_SENSOR_SOLAXX1_TX    "SolaxX1 Tx"
+#define D_SENSOR_SOLAXX1_RX    "SolaxX1 Rx"
 
 // Units
 #define D_UNIT_AMPERE "A"
@@ -659,7 +659,6 @@
 #define D_UNIT_KWARH      "kVArh"
 #define D_UNIT_ANGLE      "Deg"
 
-#ifdef USE_SOLAX_X1
 //SOLAXX1
 #define D_PV1_VOLTAGE     "PV1 Voltage"
 #define D_PV1_CURRENT     "PV1 Current"
@@ -669,24 +668,19 @@
 #define D_PV2_POWER       "PV2 Power"
 #define D_SOLAR_POWER     "Solar Power"
 #define D_INVERTER_POWER  "Inverter Power"
-#define D_WORKTIME        "Uptime"
 #define D_STATUS          "Status"
-#define D_UNIT_TEMPERATURE "°C"
-
-#define D_WAITING          "Waiting"
-#define D_CHECKING         "Checking"
-#define D_WORKING          "Working"
-#define D_FAILURE          "Failure"
-
-#define D_SOLAX_ERROR_0    "No Error Code"
-#define D_SOLAX_ERROR_1    "Grid Lost Fault"
-#define D_SOLAX_ERROR_2    "Grid Voltage Fault"
-#define D_SOLAX_ERROR_3    "Grid Frequency Fault"
-#define D_SOLAX_ERROR_4    "Pv Voltage Fault"
-#define D_SOLAX_ERROR_5    "Isolation Fault"
-#define D_SOLAX_ERROR_6    "Over Temperature Fault"
-#define D_SOLAX_ERROR_7    "Fan Fault"
-#define D_SOLAX_ERROR_8    "Other Device Fault"
-#endif
+#define D_WAITING         "Waiting"
+#define D_CHECKING        "Checking"
+#define D_WORKING         "Working"
+#define D_FAILURE         "Failure"
+#define D_SOLAX_ERROR_0   "No Error Code"
+#define D_SOLAX_ERROR_1   "Grid Lost Fault"
+#define D_SOLAX_ERROR_2   "Grid Voltage Fault"
+#define D_SOLAX_ERROR_3   "Grid Frequency Fault"
+#define D_SOLAX_ERROR_4   "Pv Voltage Fault"
+#define D_SOLAX_ERROR_5   "Isolation Fault"
+#define D_SOLAX_ERROR_6   "Over Temperature Fault"
+#define D_SOLAX_ERROR_7   "Fan Fault"
+#define D_SOLAX_ERROR_8   "Other Device Fault"
 
 #endif  // _LANGUAGE_TR_TR_H_
diff --git a/sonoff/language/uk-UK.h b/sonoff/language/uk-UK.h
index d6be00b90..b708af0a8 100644
--- a/sonoff/language/uk-UK.h
+++ b/sonoff/language/uk-UK.h
@@ -587,8 +587,8 @@
 #define D_SENSOR_ADE7953_IRQ   "ADE7953 IRQ"
 #define D_SENSOR_BUZZER        "Зуммер"
 #define D_SENSOR_OLED_RESET    "OLED Reset"
-#define D_SENSOR_SOLAXX1_TX    "SOLAXX1 Tx"
-#define D_SENSOR_SOLAXX1_RX    "SOLAXX1 Rx"
+#define D_SENSOR_SOLAXX1_TX    "SolaxX1 Tx"
+#define D_SENSOR_SOLAXX1_RX    "SolaxX1 Rx"
 
 // Units
 #define D_UNIT_AMPERE "А"
@@ -659,7 +659,6 @@
 #define D_UNIT_KWARH      "кВАр/г"
 #define D_UNIT_ANGLE      "Град"
 
-#ifdef USE_SOLAX_X1
 //SOLAXX1
 #define D_PV1_VOLTAGE     "PV1 Voltage"
 #define D_PV1_CURRENT     "PV1 Current"
@@ -669,24 +668,19 @@
 #define D_PV2_POWER       "PV2 Power"
 #define D_SOLAR_POWER     "Solar Power"
 #define D_INVERTER_POWER  "Inverter Power"
-#define D_WORKTIME        "Uptime"
 #define D_STATUS          "Status"
-#define D_UNIT_TEMPERATURE "°C"
-
-#define D_WAITING          "Waiting"
-#define D_CHECKING         "Checking"
-#define D_WORKING          "Working"
-#define D_FAILURE          "Failure"
-
-#define D_SOLAX_ERROR_0    "No Error Code"
-#define D_SOLAX_ERROR_1    "Grid Lost Fault"
-#define D_SOLAX_ERROR_2    "Grid Voltage Fault"
-#define D_SOLAX_ERROR_3    "Grid Frequency Fault"
-#define D_SOLAX_ERROR_4    "Pv Voltage Fault"
-#define D_SOLAX_ERROR_5    "Isolation Fault"
-#define D_SOLAX_ERROR_6    "Over Temperature Fault"
-#define D_SOLAX_ERROR_7    "Fan Fault"
-#define D_SOLAX_ERROR_8    "Other Device Fault"
-#endif
+#define D_WAITING         "Waiting"
+#define D_CHECKING        "Checking"
+#define D_WORKING         "Working"
+#define D_FAILURE         "Failure"
+#define D_SOLAX_ERROR_0   "No Error Code"
+#define D_SOLAX_ERROR_1   "Grid Lost Fault"
+#define D_SOLAX_ERROR_2   "Grid Voltage Fault"
+#define D_SOLAX_ERROR_3   "Grid Frequency Fault"
+#define D_SOLAX_ERROR_4   "Pv Voltage Fault"
+#define D_SOLAX_ERROR_5   "Isolation Fault"
+#define D_SOLAX_ERROR_6   "Over Temperature Fault"
+#define D_SOLAX_ERROR_7   "Fan Fault"
+#define D_SOLAX_ERROR_8   "Other Device Fault"
 
 #endif // _LANGUAGE_UK_UK_H_
diff --git a/sonoff/language/zh-CN.h b/sonoff/language/zh-CN.h
index b8f457760..cf90d0505 100644
--- a/sonoff/language/zh-CN.h
+++ b/sonoff/language/zh-CN.h
@@ -587,8 +587,8 @@
 #define D_SENSOR_ADE7953_IRQ   "ADE7953 IRQ"
 #define D_SENSOR_BUZZER        "Buzzer"
 #define D_SENSOR_OLED_RESET    "OLED Reset"
-#define D_SENSOR_SOLAXX1_TX    "SOLAXX1 Tx"
-#define D_SENSOR_SOLAXX1_RX    "SOLAXX1 Rx"
+#define D_SENSOR_SOLAXX1_TX    "SolaxX1 Tx"
+#define D_SENSOR_SOLAXX1_RX    "SolaxX1 Rx"
 
 // Units
 #define D_UNIT_AMPERE "安"
@@ -659,7 +659,6 @@
 #define D_UNIT_KWARH      "千乏时"
 #define D_UNIT_ANGLE      "度"
 
-#ifdef USE_SOLAX_X1
 //SOLAXX1
 #define D_PV1_VOLTAGE     "PV1 Voltage"
 #define D_PV1_CURRENT     "PV1 Current"
@@ -669,24 +668,19 @@
 #define D_PV2_POWER       "PV2 Power"
 #define D_SOLAR_POWER     "Solar Power"
 #define D_INVERTER_POWER  "Inverter Power"
-#define D_WORKTIME        "Uptime"
 #define D_STATUS          "Status"
-#define D_UNIT_TEMPERATURE "°C"
-
-#define D_WAITING          "Waiting"
-#define D_CHECKING         "Checking"
-#define D_WORKING          "Working"
-#define D_FAILURE          "Failure"
-
-#define D_SOLAX_ERROR_0    "No Error Code"
-#define D_SOLAX_ERROR_1    "Grid Lost Fault"
-#define D_SOLAX_ERROR_2    "Grid Voltage Fault"
-#define D_SOLAX_ERROR_3    "Grid Frequency Fault"
-#define D_SOLAX_ERROR_4    "Pv Voltage Fault"
-#define D_SOLAX_ERROR_5    "Isolation Fault"
-#define D_SOLAX_ERROR_6    "Over Temperature Fault"
-#define D_SOLAX_ERROR_7    "Fan Fault"
-#define D_SOLAX_ERROR_8    "Other Device Fault"
-#endif
+#define D_WAITING         "Waiting"
+#define D_CHECKING        "Checking"
+#define D_WORKING         "Working"
+#define D_FAILURE         "Failure"
+#define D_SOLAX_ERROR_0   "No Error Code"
+#define D_SOLAX_ERROR_1   "Grid Lost Fault"
+#define D_SOLAX_ERROR_2   "Grid Voltage Fault"
+#define D_SOLAX_ERROR_3   "Grid Frequency Fault"
+#define D_SOLAX_ERROR_4   "Pv Voltage Fault"
+#define D_SOLAX_ERROR_5   "Isolation Fault"
+#define D_SOLAX_ERROR_6   "Over Temperature Fault"
+#define D_SOLAX_ERROR_7   "Fan Fault"
+#define D_SOLAX_ERROR_8   "Other Device Fault"
 
 #endif  // _LANGUAGE_ZH_CN_H_
diff --git a/sonoff/language/zh-TW.h b/sonoff/language/zh-TW.h
index 5ec64b626..8ce0553c4 100644
--- a/sonoff/language/zh-TW.h
+++ b/sonoff/language/zh-TW.h
@@ -587,8 +587,8 @@
 #define D_SENSOR_ADE7953_IRQ   "ADE7953 IRQ"
 #define D_SENSOR_BUZZER        "Buzzer"
 #define D_SENSOR_OLED_RESET    "OLED Reset"
-#define D_SENSOR_SOLAXX1_TX    "SOLAXX1 Tx"
-#define D_SENSOR_SOLAXX1_RX    "SOLAXX1 Rx"
+#define D_SENSOR_SOLAXX1_TX    "SolaxX1 Tx"
+#define D_SENSOR_SOLAXX1_RX    "SolaxX1 Rx"
 
 // Units
 #define D_UNIT_AMPERE "安"
@@ -659,7 +659,6 @@
 #define D_UNIT_KWARH      "kVArh"
 #define D_UNIT_ANGLE      "Deg"
 
-#ifdef USE_SOLAX_X1
 //SOLAXX1
 #define D_PV1_VOLTAGE     "PV1 Voltage"
 #define D_PV1_CURRENT     "PV1 Current"
@@ -669,24 +668,19 @@
 #define D_PV2_POWER       "PV2 Power"
 #define D_SOLAR_POWER     "Solar Power"
 #define D_INVERTER_POWER  "Inverter Power"
-#define D_WORKTIME        "Uptime"
 #define D_STATUS          "Status"
-#define D_UNIT_TEMPERATURE "°C"
-
-#define D_WAITING          "Waiting"
-#define D_CHECKING         "Checking"
-#define D_WORKING          "Working"
-#define D_FAILURE          "Failure"
-
-#define D_SOLAX_ERROR_0    "No Error Code"
-#define D_SOLAX_ERROR_1    "Grid Lost Fault"
-#define D_SOLAX_ERROR_2    "Grid Voltage Fault"
-#define D_SOLAX_ERROR_3    "Grid Frequency Fault"
-#define D_SOLAX_ERROR_4    "Pv Voltage Fault"
-#define D_SOLAX_ERROR_5    "Isolation Fault"
-#define D_SOLAX_ERROR_6    "Over Temperature Fault"
-#define D_SOLAX_ERROR_7    "Fan Fault"
-#define D_SOLAX_ERROR_8    "Other Device Fault"
-#endif
+#define D_WAITING         "Waiting"
+#define D_CHECKING        "Checking"
+#define D_WORKING         "Working"
+#define D_FAILURE         "Failure"
+#define D_SOLAX_ERROR_0   "No Error Code"
+#define D_SOLAX_ERROR_1   "Grid Lost Fault"
+#define D_SOLAX_ERROR_2   "Grid Voltage Fault"
+#define D_SOLAX_ERROR_3   "Grid Frequency Fault"
+#define D_SOLAX_ERROR_4   "Pv Voltage Fault"
+#define D_SOLAX_ERROR_5   "Isolation Fault"
+#define D_SOLAX_ERROR_6   "Over Temperature Fault"
+#define D_SOLAX_ERROR_7   "Fan Fault"
+#define D_SOLAX_ERROR_8   "Other Device Fault"
 
 #endif  // _LANGUAGE_ZH_TW_H_