diff --git a/src_data/locales/cn.json b/src_data/locales/cn.json
index 9b8f90e..9e0928f 100644
--- a/src_data/locales/cn.json
+++ b/src_data/locales/cn.json
@@ -89,7 +89,7 @@
       "thermostat": {
         "heating": "供暖",
         "dhw": "生活热水",
-        "temp.current": "当前温度",
+        "currentTemp": "当前温度",
         "enable": "启用",
         "turbo": "Turbo 模式"
       },
@@ -188,7 +188,9 @@
       },
 
       "sta": {
-        "channel.note": "自动选择设置为0"
+        "channel": {
+          "note": "自动选择设置为0"
+        }
       }
     },
 
@@ -528,10 +530,14 @@
       "name": "固件升级",
 
       "section": {
-        "backupAndRestore": "备份与恢复",
-        "backupAndRestore.desc": "本功能支持备份和恢复全部设置",
-        "upgrade": "升级",
-        "upgrade.desc": "本模块支持升级设备的固件与系统文件。<br />可从以下地址下载最新版本 <a href=\"https://github.com/Laxilef/OTGateway/releases\" target=\"_blank\">Releases page</a> 。" 
+        "backupAndRestore": {
+          "title": "备份与恢复",
+          "desc": "本功能支持备份和恢复全部设置"
+        },
+        "upgrade": {
+          "title": "升级",
+          "desc": "本模块支持升级设备的固件与系统文件。<br />可从以下地址下载最新版本 <a href=\"https://github.com/Laxilef/OTGateway/releases\" target=\"_blank\">Releases page</a> 。"
+        }
       },
 
       "note": {
diff --git a/src_data/locales/en.json b/src_data/locales/en.json
index 90e2a68..f5f4c06 100644
--- a/src_data/locales/en.json
+++ b/src_data/locales/en.json
@@ -89,7 +89,7 @@
       "thermostat": {
         "heating": "Heating",
         "dhw": "DHW",
-        "temp.current": "Current",
+        "currentTemp": "Current",
         "enable": "Enable",
         "turbo": "Turbo mode"
       },
@@ -188,7 +188,9 @@
       },
 
       "sta": {
-        "channel.note": "set 0 for auto select"
+        "channel": {
+          "note": "set 0 for auto select"
+        }
       }
     },
 
@@ -528,10 +530,14 @@
       "name": "Upgrade",
 
       "section": {
-        "backupAndRestore": "Backup & restore",
-        "backupAndRestore.desc": "In this section you can save and restore a backup of ALL settings.",
-        "upgrade": "Upgrade",
-        "upgrade.desc": "In this section you can upgrade the firmware and filesystem of your device.<br />Latest releases can be downloaded from the <a href=\"https://github.com/Laxilef/OTGateway/releases\" target=\"_blank\">Releases page</a> of the project repository." 
+        "backupAndRestore": {
+          "title": "Backup & restore",
+          "desc": "In this section you can save and restore a backup of ALL settings."
+        },
+        "upgrade": {
+          "title": "Upgrade",
+          "desc": "In this section you can upgrade the firmware and filesystem of your device.<br />Latest releases can be downloaded from the <a href=\"https://github.com/Laxilef/OTGateway/releases\" target=\"_blank\">Releases page</a> of the project repository."
+        } 
       },
 
       "note": {
diff --git a/src_data/locales/it.json b/src_data/locales/it.json
index 9b0292a..55fe3f9 100644
--- a/src_data/locales/it.json
+++ b/src_data/locales/it.json
@@ -89,7 +89,7 @@
       "thermostat": {
         "heating": "Riscaldamento",
         "dhw": "ACS",
-        "temp.current": "Attuale",
+        "currentTemp": "Attuale",
         "enable": "Attiva",
         "turbo": "Turbo"
       },
@@ -188,7 +188,9 @@
       },
 
       "sta": {
-        "channel.note": "Metti 0 per auto selezione"
+        "channel": {
+          "note": "Metti 0 per auto selezione"
+        }
       }
     },
 
@@ -528,10 +530,14 @@
       "name": "Aggiornamenti",
 
       "section": {
-        "backupAndRestore": "Backup & restore",
-        "backupAndRestore.desc": "In questa sezione puoi salvare e recuperare un backup di tutte le impostazioni.",
-        "upgrade": "Aggiorna",
-        "upgrade.desc": "In questa sezione puoi aggiornare il firmware il filesystem del tuo dispositivo.<br />L'ultimo aggiornamento può essere scaricato da <a href=\"https://github.com/Laxilef/OTGateway/releases\" target=\"_blank\">Releases page</a> del progetto." 
+        "backupAndRestore": {
+          "title": "Backup & restore",
+          "desc": "In questa sezione puoi salvare e recuperare un backup di tutte le impostazioni."
+        },
+        "upgrade": {
+          "title": "Aggiorna",
+          "desc": "In questa sezione puoi aggiornare il firmware il filesystem del tuo dispositivo.<br />L'ultimo aggiornamento può essere scaricato da <a href=\"https://github.com/Laxilef/OTGateway/releases\" target=\"_blank\">Releases page</a> del progetto."
+        }
       },
 
       "note": {
diff --git a/src_data/locales/nl.json b/src_data/locales/nl.json
index eadab19..ca1d514 100644
--- a/src_data/locales/nl.json
+++ b/src_data/locales/nl.json
@@ -82,7 +82,7 @@
       "thermostat": {
         "heating": "Verwarming",
         "dhw": "Warm water",
-        "temp.current": "Huidig",
+        "currentTemp": "Huidig",
         "enable": "Inschakelen",
         "turbo": "Turbomodus"
       },
@@ -169,7 +169,9 @@
         "dns": "DNS"
       },
       "sta": {
-        "channel.note": "zet op 0 voor automatische selectie"
+        "channel": {
+          "note": "zet op 0 voor automatische selectie"
+        }
       }
     },
     "sensors": {
@@ -490,10 +492,14 @@
       "title": "Upgrade - OpenTherm Gateway",
       "name": "Upgrade",
       "section": {
-        "backupAndRestore": "Back-up & herstel",
-        "backupAndRestore.desc": "In deze sectie kunt u een back-up van ALLE instellingen opslaan en herstellen.",
-        "upgrade": "Upgrade",
-        "upgrade.desc": "In deze sectie kunt u de firmware en het bestandssysteem van uw apparaat upgraden.<br />De nieuwste releases kunnen worden gedownload van de <a href=\"https://github.com/Laxilef/OTGateway/releases\" target=\"_blank\">Releases-pagina</a> van de projectrepository."
+        "backupAndRestore": {
+          "title": "Back-up & herstel",
+          "desc": "In deze sectie kunt u een back-up van ALLE instellingen opslaan en herstellen."
+        },
+        "upgrade": {
+          "title": "Upgrade",
+          "desc": "In deze sectie kunt u de firmware en het bestandssysteem van uw apparaat upgraden.<br />De nieuwste releases kunnen worden gedownload van de <a href=\"https://github.com/Laxilef/OTGateway/releases\" target=\"_blank\">Releases-pagina</a> van de projectrepository."
+        }
       },
       "note": {
         "disclaimer1": "Na een succesvolle upgrade van het bestandssysteem worden ALLE instellingen teruggezet naar de standaardwaarden! Sla een back-up op voordat u gaat upgraden.",
diff --git a/src_data/locales/ru.json b/src_data/locales/ru.json
index 5e1e5c3..7fdfa72 100644
--- a/src_data/locales/ru.json
+++ b/src_data/locales/ru.json
@@ -90,7 +90,7 @@
       "thermostat": {
         "heating": "Отопление",
         "dhw": "ГВС",
-        "temp.current": "Текущая",
+        "currentTemp": "Текущая",
         "enable": "Вкл",
         "turbo": "Турбо"
       },
@@ -189,7 +189,9 @@
       },
 
       "sta": {
-        "channel.note": "установите 0 для автоматического выбора"
+        "channel": {
+          "note": "установите 0 для автоматического выбора"
+        }
       }
     },
 
@@ -529,10 +531,14 @@
       "name": "Обновление",
 
       "section": {
-        "backupAndRestore": "Резервное копирование и восстановление",
-        "backupAndRestore.desc": "В этом разделе вы можете сохранить и восстановить резервную копию ВСЕХ настроек.",
-        "upgrade": "Обновление",
-        "upgrade.desc": "В этом разделе вы можете обновить прошивку и файловую систему вашего устройства.<br />Последнюю версию можно загрузить со страницы <a href=\"https://github.com/Laxilef/OTGateway/releases\" target=\"_blank\">Релизы</a> в репозитории проекта." 
+        "backupAndRestore": {
+          "title": "Резервное копирование и восстановление",
+          "desc": "В этом разделе вы можете сохранить и восстановить резервную копию ВСЕХ настроек."
+        },
+        "upgrade": {
+          "title": "Обновление",
+          "desc": "В этом разделе вы можете обновить прошивку и файловую систему вашего устройства.<br />Последнюю версию можно загрузить со страницы <a href=\"https://github.com/Laxilef/OTGateway/releases\" target=\"_blank\">Релизы</a> в репозитории проекта."
+        }
       },
 
       "note": {
diff --git a/src_data/pages/dashboard.html b/src_data/pages/dashboard.html
index 7e87834..50f57e5 100644
--- a/src_data/pages/dashboard.html
+++ b/src_data/pages/dashboard.html
@@ -47,7 +47,7 @@
                 <div class="thermostat-header" data-i18n>dashboard.thermostat.heating</div>
                 <div class="thermostat-temp">
                   <div class="thermostat-temp-target"><span class="targetTemp"></span> <span class="tempUnit"></span></div>
-                  <div class="thermostat-temp-current"><span data-i18n>dashboard.thermostat.temp.current</span>: <span id="tHeatCurrentTemp"></span> <span class="tempUnit"></span></div>
+                  <div class="thermostat-temp-current"><span data-i18n>dashboard.thermostat.currentTemp</span>: <span id="tHeatCurrentTemp"></span> <span class="tempUnit"></span></div>
                 </div>
                 <div class="thermostat-minus">
                   <button class="tAction outline" data-action="decrement"><i class="icons-down"></i></button>
@@ -68,7 +68,7 @@
                 <div class="thermostat-header" data-i18n>dashboard.thermostat.dhw</div>
                 <div class="thermostat-temp">
                   <div class="thermostat-temp-target"><span class="targetTemp"></span> <span class="tempUnit"></span></div>
-                  <div class="thermostat-temp-current"><span data-i18n>dashboard.thermostat.temp.current</span>: <span id="tDhwCurrentTemp"></span> <span class="tempUnit"></span></div>
+                  <div class="thermostat-temp-current"><span data-i18n>dashboard.thermostat.currentTemp</span>: <span id="tDhwCurrentTemp"></span> <span class="tempUnit"></span></div>
                 </div>
                 <div class="thermostat-minus">
                   <button class="tAction outline" data-action="decrement"><i class="icons-down"></i></button>
diff --git a/src_data/pages/upgrade.html b/src_data/pages/upgrade.html
index 80c6202..dcdca33 100644
--- a/src_data/pages/upgrade.html
+++ b/src_data/pages/upgrade.html
@@ -35,7 +35,7 @@
       <article>
         <div>
           <hgroup>
-            <h2 data-i18n>upgrade.section.backupAndRestore</h2>
+            <h2 data-i18n>upgrade.section.backupAndRestore.title</h2>
             <p data-i18n>upgrade.section.backupAndRestore.desc</p>
           </hgroup>
 
@@ -56,7 +56,7 @@
       <article>
         <div>
           <hgroup>
-            <h2 data-i18n>upgrade.section.upgrade</h2>
+            <h2 data-i18n>upgrade.section.upgrade.title</h2>
             <p data-i18n>upgrade.section.upgrade.desc</p>
           </hgroup>