update for 3.4.0

Merge remote-tracking branch 'origin/dev' into main
Merge remote-tracking branch 'origin/dev'
2025-12-06 15:59:52 +03:00 · 2022-05-23 21:20:45 +02:00 · 2022-05-23 21:20:36 +02:00 · 2022-01-20 10:51:40 +01:00 · 2021-11-28 23:03:28 +01:00 · 2021-11-28 23:03:15 +01:00
382 changed files with 30087 additions and 32134 deletions
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,50 +1,35 @@
 ---
-name: Problem Report
-about: Create a Report to help us improve
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: bug
+assignees: ''
+
 ---

-<!-- Thanks for reporting a problem for this project. READ THIS FIRST:
+*Before creating a new issue please check that you have:*

-Please DO NOT OPEN AN ISSUE if your EMS-ESP version is not the latest from the dev branch, please update your device before submitting your issue. Your problem might already be solved. The latest precompiled binaries of EMS-ESP can be downloaded from https://github.com/emsesp/EMS-ESP32/releases/tag/latest
+* *searched the existing [issues](https://github.com/emsesp/EMS-ESP32/issues) (both open and closed)*
+* *searched the [documentation help section](https://emsesp.github.io/docs)*

-Please take a few minutes to complete the requested information below.
+*Completing this template will help developers and contributors to address the issue. Try to be as specific and extensive as possible. If the information provided is not enough the issue will likely be closed.*

-->
+*You can now remove this line and the above ones. Text in italic is meant to be replaced by your own words. If any of the sections below are not relevant to the issue (for instance, the screenshots) then you can delete them.*

-### PROBLEM DESCRIPTION
+**Bug description**
+*A clear and concise description of what the bug is. Mention which EMS-ESP version you're using.*

-_A clear and concise description of what the problem is._
+**Steps to reproduce**
+*Steps to reproduce the behavior.*

-### REQUESTED INFORMATION
+**Expected behavior**
+*A clear and concise description of what you expected to happen.*

-_Make sure your have performed every step and checked the applicable boxes before submitting your issue. Thank you!_
+**Screenshots**
+*If applicable, add screenshots to help explain your problem.*

- [ ] Searched the problem in [issues](https://github.com/emsesp/EMS-ESP32/issues)
- [ ] Searched the problem in [discussions](https://github.com/emsesp/EMS-ESP32/discussions)
- [ ] Searched the problem in the [docs](https://emsesp.github.io/docs/Troubleshooting/)
- [ ] Searched the problem in the [chat](https://discord.gg/3J3GgnzpyT)
- [ ] Provide the output of http://ems-esp.local/api/system :
+**Device information**
+*Copy-paste here the information as it is outputted by the device. You can get this information by from http://ems-esp.local/api/system*

-```lua
-  System information output here:
-
-
-```
-
-### TO REPRODUCE
-
-_Steps to reproduce the behavior:_
-
-### EXPECTED BEHAVIOUR
-
-_A clear and concise description of what you expected to happen._
-
-### SCREENSHOTS
-
-_If applicable, add screenshots to help explain your problem._
-
-### ADDITIONAL CONTEXT
-
-_Add any other context about the problem here._
-
-**(Please, remember to close the issue when the problem has been addressed)**
+**Additional context**
+*Add any other context about the problem here.*
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,11 +0,0 @@
-blank_issues_enabled: false
-contact_links:
-  - name: EMS-ESP Docs
-    url: https://emsesp.github.io/docs/
-    about: All the information related to EMS-ESP.
-  - name: EMS-ESP Discussions and Support
-    url: https://github.com/emsesp/EMS-ESP32/discussions
-    about: EMS-ESP usage Questions, Feature Requests and Projects.
-  - name: EMS-ESP Users Chat
-    url: https://discord.gg/3J3GgnzpyT
-    about: Chat for feedback, questions and troubleshooting.
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,26 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: enhancement
+assignees: ''
+
+---
+
+*Before creating a new feature request please check that you have searched the existing [issues](https://github.com/emsesp/EMS-ESP32/issues) (both open and closed)*
+
+*Completing this template will help developers and contributors evaluating the feature. If the information provided is not enough the issue will likely be closed.*
+
+*You can now remove this line and the above ones. Text in italic is meant to be replaced by your own words. If any of the sections below are not relevant to the request then you can delete them.*
+
+**Is your feature request related to a problem? Please describe.**
+*A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]*
+
+**Describe the solution you'd like**
+*A clear and concise description of what you want to happen.*
+
+**Describe alternatives you've considered**
+*A clear and concise description of any alternative solutions or features you've considered.*
+
+**Additional context**
+*Add any other context or screenshots about the feature request here.*
--- a/.github/ISSUE_TEMPLATE/questions---troubleshooting.md
+++ b/.github/ISSUE_TEMPLATE/questions---troubleshooting.md
@@ -0,0 +1,29 @@
+---
+name: Questions & Troubleshooting
+about: Anything not a bug or feature request
+title: ''
+labels: question
+assignees: ''
+
+---
+
+*Before creating a new issue please check that you have:*
+
+* *searched the existing [issues](https://github.com/emsesp/EMS-ESP32/issues) (both open and closed)*
+* *searched the [documentation help section](https://emsesp.github.io/docs)*
+
+*Completing this template will help developers and contributors help you. Try to be as specific and extensive as possible. If the information provided is not enough the issue will likely be closed.*
+
+*You can now remove this line and the above ones. Text in italic is meant to be replaced by your own words. If any of the sections below are not relevant to the issue (for instance, the screenshots) then you can delete them.*
+
+**Question**
+*A clear and concise description of what the problem/doubt is.*
+
+**Screenshots**
+*If applicable, add screenshots to help explain your problem.*
+
+**Device information**
+*Copy-paste here the information as it is outputted by the device. You can get this information from http://ems-esp.local/api/system*
+
+**Additional context**
+*Add any other context about the problem here.*
--- a/.github/workflows/pre_release.yml
+++ b/.github/workflows/pre_release.yml
@@ -14,9 +14,9 @@ jobs:

    steps:
    
-      - uses: actions/checkout@v3
-      - uses: actions/setup-python@v4
-      - uses: actions/setup-node@v3
+      - uses: actions/checkout@v2
+      - uses: actions/setup-python@v2
+      - uses: actions/setup-node@v2
        with:
          node-version: '16'

@@ -24,19 +24,19 @@ jobs:
        id: build_info
        run: |
          version=`grep -E '^#define EMSESP_APP_VERSION' ./src/version.h | awk -F'"' '{print $2}'`
-          echo "VERSION=$version" >> $GITHUB_OUTPUT
+          echo "::set-output name=version::$version"

      - name: Install PlatformIO
        run: |
          python -m pip install --upgrade pip
          pip install -U platformio
+          platformio upgrade
+          platformio update

      - name: Build WebUI
        run: |
          cd interface
          npm ci
-          npx typesafe-i18n --no-watch
-          sed -i "s/= 'pl'/= 'en'/" ./src/i18n/i18n-util.ts
          npm run build

      - name: Build firmware
@@ -48,7 +48,7 @@ jobs:
        uses: "marvinpinto/action-automatic-releases@latest"
        with:
          repo_token: "${{ secrets.GITHUB_TOKEN }}"
-          title: Development Build v${{steps.build_info.outputs.VERSION}}
+          title: Development Build v${{steps.build_info.outputs.version}}
          automatic_release_tag: "latest"
          prerelease: true
          files: |
--- a/.github/workflows/sonar_check.yml
+++ b/.github/workflows/sonar_check.yml
@@ -9,10 +9,9 @@ jobs:
  build:
    name: Build
    runs-on: ubuntu-latest
-    if: github.repository_owner == 'emsesp'
-    # if: github.repository == 'emsesp/EMS-ESP32'
    env:
      # https://binaries.sonarsource.com/?prefix=Distribution/sonar-scanner-cli/
+      # SONAR_SCANNER_VERSION: 4.6.1.2450
      SONAR_SCANNER_VERSION: 4.7.0.2747                                
      SONAR_SERVER_URL: "https://sonarcloud.io"
      BUILD_WRAPPER_OUT_DIR: build_wrapper_output_directory
--- a/.github/workflows/tagged_release.yml
+++ b/.github/workflows/tagged_release.yml
@@ -24,14 +24,12 @@ jobs:
          python -m pip install --upgrade pip
          pip install -U platformio
          platformio upgrade
-          pio pkg update
+          platformio update

      - name: Build WebUI
        run: |
          cd interface
          npm ci
-          npx typesafe-i18n --no-watch
-          sed -i "s/= 'pl'/= 'en'/" ./src/i18n/i18n-util.ts
          npm run build

      - name: Build firmware
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,7 @@
 # vscode
 .vscode
+.directory
+workspace.code-workspace

 # build
 build/
@@ -11,6 +13,7 @@ debug.log
 # platformio
 .pio
 pio_local.ini
+/.VSCodeCounter

 # OS specific
 .DS_Store
@@ -28,18 +31,7 @@ test.sh
 scripts/__pycache__
 .temp

-# i18n generated files
-interface/src/i18n/i18n-react.tsx
-interface/src/i18n/i18n-types.ts
-interface/src/i18n/i18n-util.ts
-interface/src/i18n/i18n-util.sync.ts
-interface/src/i18n/i18n-util.async.ts
-
 # sonar
 .scannerwork/
 sonar/
 build_wrapper_output_directory/
-
-# other build files
-dump_entities.csv
-dump_entities.xls*
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,108 +5,6 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

-# [3.5.0] February 6 2023
-
-## **IMPORTANT! BREAKING CHANGES**
-
- When upgrading to v3.5 for the first time from v3.4 on a BBQKees Gateway board you will need to use the [EMS-EPS Flasher](https://github.com/emsesp/EMS-ESP-Flasher/releases) to correctly re-partition the flash. Make sure you backup the settings and customizations from the WebUI (System->Upload/Download) and restore after the upgrade.
- Support for multiple EMS-ESPs [#759] has been added as an optional setting for MQTT. When enabled, which is now the default, all MQTT Discovery Entity IDs will include the MQTT base name and the shortname of the EMS-ESP device entity. For example what was previously `sensor.boiler_actual_boiler_temperature` will now become `sensor.ems_esp_boiler_boiltemp`. If you still want to use the old format and retain the history and script compatibility in Home Assistant then set this back to the old format.
-
-## Added
-
- Translations in Web UI and all device entity names (DE, NL, SV, PL, NO, FR) [#22](https://github.com/emsesp/EMS-ESP32/issues/22)
- Add support for Lolin C3 mini [#620](https://github.com/emsesp/EMS-ESP32/pull/620)
- Add support for ESP32-S2 [#667](https://github.com/emsesp/EMS-ESP32/pull/667)
- Add devices: Greenstar 30Ri boiler, Junkers FW500 thermostat, Buderus BC30 controller
- Add program memory info
- Add mqtt queue and connection infos
- Adapt min/max if ems-value is not in this range
- Add heat pump settings for inputs and limits [#600](https://github.com/emsesp/EMS-ESP32/issues/600)
- Add hybrid heatpump [#500](https://github.com/emsesp/EMS-ESP32/issues/500)
- Add translated tags
- Add min/max to customization table [#686](https://github.com/emsesp/EMS-ESP32/issues/686)
- Add MD5 check [#637](https://github.com/emsesp/EMS-ESP32/issues/637)
- Add more bus-ids [#673](https://github.com/emsesp/EMS-ESP32/issues/673)
- Use HA connectivity device class for Status, added boot time [#751](https://github.com/emsesp/EMS-ESP32/issues/751)
- Add commands for analog sensors outputs
- Support for multiple EMS-ESPs with MQTT and HA [[#759](https://github.com/emsesp/EMS-ESP32/issues/759)]
- Settings for heatpump silent mode and additional heater [[#802](https://github.com/emsesp/EMS-ESP32/issues/802)] [[#803](https://github.com/emsesp/EMS-ESP32/issues/803)]
- Zone module MZ100 [#826](https://github.com/emsesp/EMS-ESP32/issues/826)
- Default MQTT hostname is blank [#829](https://github.com/emsesp/EMS-ESP32/issues/829)
- wwCurFlow for ems+ devices [#829](https://github.com/emsesp/EMS-ESP32/issues/829)
- Add Rego 3000, TR120RF thermostats [#917](https://github.com/emsesp/EMS-ESP32/issues/917)
- Add config for ESP32-S3
- Add heatpump silent mode and other entities [#896](https://github.com/emsesp/EMS-ESP32/issues/896)
- Allow reboot to other partition (factory or asymetric OTA)
- Blacklist entities to remove from memory [#891](https://github.com/emsesp/EMS-ESP32/issues/891)
- Add boiler pump operating mode [#944](https://github.com/emsesp/EMS-ESP32/issues/944)
-
-## Fixed
-
- Factory Reset not working [#628](https://github.com/emsesp/EMS-ESP32/issues/628)
- Valid 4 byte values [#820](https://github.com/emsesp/EMS-ESP32/issues/820)
- Commands for multiple thermostats [#826](https://github.com/emsesp/EMS-ESP32/issues/826)
- API queries for multiple devices [#865](https://github.com/emsesp/EMS-ESP32/issues/865)
- Console crash when using call with command `hcx` only. [#841](https://github.com/emsesp/EMS-ESP32/issues/841)
- `heatingPump2Mod` was wrong, changed to absBurnPow [[#908](https://github.com/emsesp/EMS-ESP32/issues/908)
- Rounding of web input values
- Analog sensor with single gpio number [#915](https://github.com/emsesp/EMS-ESP32/issues/915)
- HA dallas and analog configs: remove/rebuild on change [#888](https://github.com/emsesp/EMS-ESP32/issues/888)
- Modes and set seltemp for RC30 and RC20 [#932](https://github.com/emsesp/EMS-ESP32/issues/932)
-
-## Changed
-
- Discovery in HomeAssistant don't work with custom base topic. [#596](https://github.com/emsesp/EMS-ESP32/issues/596) Base topic containing `/` are changed to `_`
- RF room temperature sensor are shown as thermostat
- Render mqtt float json values with trailing zero
- Removed flash strings, to increase available heap memory
- Reload page after restart button is pressed
- Analog/dallas values command as list like ems-devices
- Analog/dallas HA-entities based on id
- MQTT Base is a mandatory field. Removed MQTT topic length from settings
- HA duration class for time entities [[#822](https://github.com/emsesp/EMS-ESP32/issues/822)
- AM200 alternative heatsource as class heatsource [[#857](https://github.com/emsesp/EMS-ESP32/issues/857)
-
-# [3.4.2] September 18 2022
-
-## Added
-
- RC310 additions [#520](https://github.com/emsesp/EMS-ESP32/pull/520)
-  - damping
-  - wwprio for RC310 heating circuits
-  - switchonoptimization for RC310 heating circuits
-  - enum_controlmode for RC310 (new enum list)
-  - nofrostmode, reducemode, reducetemp & noreducetemp for RC310
-  - emergencyops and emergencytemp, wwmaxtemp, wwflowtempoffset and wwcomfort1 for RC310
-  - HM200 hybrid module [#500](https://github.com/emsesp/EMS-ESP32/issues/500)
-  - AM200 alternative heatsource module [#573](https://github.com/emsesp/EMS-ESP32/issues/573)
-  - EM10 error module as gateway [#575](https://github.com/emsesp/EMS-ESP32/issues/575)
-
-## Fixed
-
- fix Table resizing in WebUI [#519](https://github.com/emsesp/EMS-ESP32/issues/519)
- allow larger customization files [#570](https://github.com/emsesp/EMS-ESP32/issues/570)
- losing entitiy wwcomfort [#581](https://github.com/emsesp/EMS-ESP32/issues/581)
-
-## Changed
-
- Shorten "friendly names" in Home Assistant [#555](https://github.com/emsesp/EMS-ESP32/issues/555)
- platformio 2.3.0 (IDF 4, Arduino 2)
- remove master-thermostat, support multiple thermostats
- merge up- and download in webui [#577](https://github.com/emsesp/EMS-ESP32/issues/577)
-
-# [3.4.1] May 29 2022
-
-## Fixed
-
- Fix memory leak in api [#524](https://github.com/emsesp/EMS-ESP32/issues/524)
-
-## Changed
-
- Controller data in web-ui only for IVT [#522](https://github.com/emsesp/EMS-ESP32/issues/522)
- Rename hidden `climate` to a more explaining name [#523](https://github.com/emsesp/EMS-ESP32/issues/523)
- Minor changes to the Customizations web page [#527](https://github.com/emsesp/EMS-ESP32/pull/527)
-
 # [3.4.0] May 23 2022

 ## Added
@@ -372,15 +270,51 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

 ## Added

+- power settings, disabling BLE and turning off Wifi sleep
+- Rx and Tx counts to Heartbeat MQTT payload
+- ethernet support
+- id to info command to show only a heatingcircuit
+- add sending devices that are not listed to 0x07
+- extra MQTT boolean option for "ON" and "OFF"
+- support for chunked MQTT payloads to allow large data sets > 2kb
+- external Button support (#708) for resetting to factory defaults and other actions
+- new console set command in `system`, `set board_profile <profile>` for quickly enabling cabled ethernet connections without using the captive wifi portal
+- added in MQTT nested mode, for thermostat and mixer, like we had back in v2
+- cascade MC400 (product-id 210) (3.0.0b6), power values for heating sources (3.0.1b1)
+- values for wwMaxPower, wwFlowtempOffset
+- RC300 `thermostat temp -1` to clear temporary setpoint in auto mode
+- syslog port selectable (#744)
 - individual mqtt commands (#31)
 - board Profiles (#11)

 ## Fixed

+- telegrams matched to masterthermostat 0x18
+- multiple roomcontrollers
+- readback after write with delay (give ems-devices time to set the value)
+- thermostat ES72/RC20 device 66 to command-set RC20_2
+- MQTT payloads not adding to queue when MQTT is re-connecting (fixes #369)
+- fix for HA topics with invalid command formats (#728)
+- wrong position of values #723, #732
+- OTA Upload via Web on OSX
 - Rx and Tx quality % would sometimes show > 100

 ## Changed

+- changed how telegram parameters are rendered for mqtt, console and web (#632)
+- split `show values` in smaller packages (edited)
+- extended length of IP/hostname from 32 to 48 chars (#676)
+- check flowsensor for `tap_water_active`
+- mqtt prefixed with `Base`
+- count Dallas sensor fails
+- switch from SPIFFS to LITTLEFS
+- added ID to MQTT payloads which is the Device's product ID and used in HA to identify a unique HA device
+- increased MQTT buffer and reduced wait time between publishes
+- updated to the latest ArduinoJson library
+- some names of mqtt-tags like in v2.2.1
+- new ESP32 partition side to allow for smoother OTA and fallback
+- network Gateway IP is optional (#682)emsesp/EMS-ESP
+- moved to a new GitHub repo https://github.com/emsesp/EMS-ESP32
 - invert LED changed to Hide LED. Default is off.
 - renamed Scan Network to Scan WiFi Network
 - added version to cmd=settings
--- a/CHANGELOG_LATEST.md
+++ b/CHANGELOG_LATEST.md
@@ -1,20 +0,0 @@
-# Changelog
-
-# [3.5.1]
-
-## Added
-
- Detect old Tado thermostat, device-id 0x19, no entities
- Some more HM200 entities [#500](https://github.com/emsesp/EMS-ESP32/issues/500)
- Add entity to force heating off (for systems without thermostat) [#951](https://github.com/emsesp/EMS-ESP32/issues/951)
-
-## Fixed
-
- HA-discovery for analog sensor commands [#1035](https://github.com/emsesp/EMS-ESP32/issues/1035)
-
-## Changed
-
- Use byte 0 for detection RC30 active heatingcircuit [#786](https://github.com/emsesp/EMS-ESP32/issues/786)
- Write repeated selflowtemp if tx-queue is empty without verify [#954](https://github.com/emsesp/EMS-ESP32/issues/954)
- HA discovery recreate after disconnect by device [#1067](https://github.com/emsesp/EMS-ESP32/issues/1067)
- File upload: check flash size (overflow) instead of filesize
--- a/23
+++ b/23
@@ -1,7 +1,7 @@
 #
 # GNUMakefile for EMS-ESP
+# (c) 2020 Paul Derbyshire
 #
-
 NUMJOBS=${NUMJOBS:-" -j4 "}
 MAKEFLAGS+="j "
 #----------------------------------------------------------------------
@@ -17,30 +17,23 @@ MAKEFLAGS+="j "
 #TARGET    := $(notdir $(CURDIR))
 TARGET    := emsesp
 BUILD     := build
-SOURCES   := src src/* lib_standalone lib/uuid-common/src lib/uuid-console/src lib/uuid-log/src src/devices lib/ArduinoJson/src lib/PButton lib/semver
-INCLUDES  := src lib_standalone lib/ArduinoJson/src lib/uuid-common/src lib/uuid-console/src lib/uuid-log/src lib/uuid-telnet/src lib/uuid-syslog/src lib/semver lib/* src/devices
+SOURCES   := src src/* lib_standalone lib/uuid-common/src lib/uuid-console/src lib/uuid-log/src src/devices lib/ArduinoJson/src lib/PButton
+INCLUDES  := src lib_standalone lib/ArduinoJson/src lib/uuid-common/src lib/uuid-console/src lib/uuid-log/src lib/uuid-telnet/src lib/uuid-syslog/src lib/* src/devices
 LIBRARIES := 

 CPPCHECK = cppcheck
-# CHECKFLAGS = -q --force --std=c++17
 CHECKFLAGS = -q --force --std=c++11

 #----------------------------------------------------------------------
 # Languages Standard
 #----------------------------------------------------------------------
-# C_STANDARD   := -std=c17
-# CXX_STANDARD := -std=c++17
 C_STANDARD   := -std=c11
 CXX_STANDARD := -std=c++11

 #----------------------------------------------------------------------
 # Defined Symbols
 #----------------------------------------------------------------------
-DEFINES += -DARDUINOJSON_ENABLE_STD_STRING=1 -DARDUINOJSON_ENABLE_PROGMEM=1 -DARDUINOJSON_ENABLE_ARDUINO_STRING -DARDUINOJSON_USE_DOUBLE=0 
-DEFINES += -DEMSESP_DEBUG -DEMSESP_STANDALONE -DEMSESP_USE_SERIAL
-DEFINES += $(ARGS)
-
-DEFAULTS = -DEMSESP_DEFAULT_LOCALE=\"en\" -DEMSESP_DEFAULT_TX_MODE=8 -DEMSESP_DEFAULT_VERSION=\"3.5.0b11\" -DEMSESP_DEFAULT_BOARD_PROFILE=\"S32\"
+DEFINES += -DFACTORY_WIFI_HOSTNAME=\"ems-esp\" -DARDUINOJSON_ENABLE_STD_STRING=1 -DARDUINOJSON_ENABLE_PROGMEM=1 -DARDUINOJSON_ENABLE_ARDUINO_STRING -DARDUINOJSON_USE_DOUBLE=0 -DEMSESP_DEBUG -DEMSESP_STANDALONE -DEMSESP_USE_SERIAL -DEMSESP_DEFAULT_BOARD_PROFILE=\"LOLIN\"

 #----------------------------------------------------------------------
 # Sources & Files
@@ -73,7 +66,7 @@ CXX := /usr/bin/g++
 # CXXFLAGS  C++ Compiler Flags
 # LDFLAGS   Linker Flags
 #----------------------------------------------------------------------
-CPPFLAGS  += $(DEFINES) $(DEFAULTS) $(INCLUDE)
+CPPFLAGS  += $(DEFINES) $(INCLUDE)
 CPPFLAGS  += -ggdb
 CPPFLAGS  += -g3
 CPPFLAGS  += -Os
@@ -121,8 +114,6 @@ COMPILE.cpp = $(CXX) $(CXX_STANDARD) $(CXXFLAGS) $(DEPFLAGS) -c $< -o $@
 # Targets
 #----------------------------------------------------------------------
 .PHONY: all
-.SILENT: $(OUTPUT)
-
 all: $(OUTPUT)

 $(OUTPUT): $(OBJS)
@@ -150,10 +141,10 @@ run: $(OUTPUT)

 .PHONY: clean
 clean:
-	@$(RM) -rf $(BUILD) $(OUTPUT)
+	@$(RM) -r $(BUILD) $(OUTPUT)

 help:
 	@echo available targets: all run clean
 	@echo $(OUTPUT)

-include $(DEPS)
+-include $(DEPS)
--- a/README.md
+++ b/README.md
@@ -1,5 +1,17 @@
 # ![logo](media/EMS-ESP_logo_dark.png)

+**EMS-ESP** is an open-source firmware for the Espressif ESP8266 and ESP32 microcontroller that communicates with **EMS** (Energy Management System) based equipment from manufacturers like Bosch, Buderus, Nefit, Junkers, Worcester and Sieger.
+
+This project is the specifically for the ESP32. Compared with the previous ESP8266 (version 2) release it has the following enhancements:
+
+- Ethernet Support
+- Pre-configured circuit board layouts
+- Supports writing EMS values directly from within Web UI
+- Mock API server for faster offline development and testing
+- Improved API and MQTT commands
+- Improvements to Dallas temperature sensors
+- Embedded log tracing in the Web UI
+
 [![version](https://img.shields.io/github/release/emsesp/EMS-ESP32.svg?label=Latest%20Release)](https://github.com/emsesp/EMS-ESP32/blob/main/CHANGELOG.md)
 [![release-date](https://img.shields.io/github/release-date/emsesp/EMS-ESP32.svg?label=Released)](https://github.com/emsesp/EMS-ESP32/commits/main)
 [![license](https://img.shields.io/github/license/emsesp/EMS-ESP32.svg)](LICENSE)
@@ -8,54 +20,34 @@
 [![downloads](https://img.shields.io/github/downloads/emsesp/EMS-ESP32/total.svg)](https://github.com/emsesp/EMS-ESP32/releases)
 [![chat](https://img.shields.io/discord/816637840644505620.svg?style=flat-square&color=blueviolet)](https://discord.gg/3J3GgnzpyT)

+If you like **EMS-ESP**, please give it a star, or fork it and contribute!
+
 [![GitHub stars](https://img.shields.io/github/stars/emsesp/EMS-ESP32.svg?style=social&label=Star)](https://github.com/emsesp/EMS-ESP32/stargazers)
 [![GitHub forks](https://img.shields.io/github/forks/emsesp/EMS-ESP32.svg?style=social&label=Fork)](https://github.com/emsesp/EMS-ES32P/network)
 [![donate](https://img.shields.io/badge/donate-PayPal-blue.svg)](https://www.paypal.com/paypalme/prderbyshire/2)

-**EMS-ESP** is an open-source firmware for the Espressif ESP32 microcontroller that communicates with **EMS** (Energy Management System) based equipment from manufacturers like Bosch, Buderus, Nefit, Junkers, Worcester and Sieger. It requires a small gateway circuit to interface with the EMS bus which can be purchased from <https://bbqkees-electronics.nl> or custom built.
+Note, EMS-ESP requires a small hardware circuit that can convert the EMS bus data to be read by the microcontroller. These can be ordered at <https://bbqkees-electronics.nl> or contact the contributors that can provide the schematic and designs.

-## **Features**
+<img src="media/gateway-integration.jpg" width=40%>

- A multi-user, multi-language secure web interface to change settings and monitor incoming data
+---
+
+# **Features**
+
+- A multi-user secure web interface to change settings and monitor incoming data
 - A console, accessible via Serial and Telnet for more advanced monitoring
- Native support for Home Assistant, Domoticz and openHAB via [MQTT Discovery](https://www.home-assistant.io/docs/mqtt/discovery/)
+- Native support for Home Assistant and Domoticz via [MQTT Discovery](https://www.home-assistant.io/docs/mqtt/discovery/)
 - Can run standalone as an independent WiFi Access Point or join an existing WiFi network
 - Easy first-time configuration via a web Captive Portal
- Support for more than [110 EMS devices](https://emsesp.github.io/docs/#/Supported-EMS-Devices) (boilers, thermostats, solar modules, mixer modules, heat pumps, gateways, switches, heat sources)
-
-## **Documentation**
-
-For the complete documentation on how to install, configure and get support visit the [EMS-ESP Wiki](https://emsesp.github.io/docs).
-
-## **Support**
-
-To chat with the community reach out on our [Discord Server](https://discord.gg/3J3GgnzpyT).
-
-If you like **EMS-ESP**, please give it a star, or fork it and contribute or offer a small donation!
+- Support for more than [100 EMS devices](https://emsesp.github.io/docs/#/Supported-EMS-Devices) (boilers, thermostats, solar modules, mixer modules, heat pumps, gateways)

 ## **Demo**

-For a live demo of the Web UI click [here](https://ems-esp.derbyshire.nl) and log in with any username/password.
+See a demo [here](https://ems-esp.derbyshire.nl). Log in with any username/password.

-## **Contributors ✨**
+# **Screenshots**

-EMS-ESP is a project owned and maintained by [proddy](https://github.com/proddy) and [MichaelDvP](https://github.com/MichaelDvP).
-
-## **Libraries used**
-
- [esp8266-react](https://github.com/rjwats/esp8266-react) by @rjwats for the framework that provides the core of the Web UI
- [uuid-\*](https://github.com/nomis/mcu-uuid-console) from @nomis. The console, syslog, telnet and logging are based off these open source libraries
- [ArduinoJson](https://github.com/bblanchon/ArduinoJson) for all the JSON
- [AsyncMqttClient](https://github.com/marvinroger/async-mqtt-client) for the MQTT client, with custom modifications from @bertmelis and @proddy
- ESPAsyncWebServer and AsyncTCP for the Web server and TCP backends, with custom modifications for performance
-
-## **License**
-
-This program is licensed under GPL-3.0
-
-## **Screenshots**
-
-### Web Interface
+## Web Interface

 |                                    |                                  |
 | ---------------------------------- | -------------------------------- |
@@ -63,10 +55,75 @@ This program is licensed under GPL-3.0
 | <img src="media/web_devices.png">  | <img src="media/web_mqtt.png">   |
 | <img src="media/web_edit.png">     | <img src="media/web_log.png">    |

-### Telnet Console
+## Telnet Console

-<img src="media/console0.png" width=80% height=80%>
+<img src="media/console.png" width=80% height=80%>

-### In Home Assistant
+## In Home Assistant

 <img src="media/ha_lovelace.png" width=80% height=80%>
+  
+# **Installing**
+
+Refer to the [official documentation](https://emsesp.github.io/docs) to how to install the firmware and configure it. The documentation is being constantly updated as new features and settings are added.
+
+You can choose to use an pre-built firmware image or compile the code yourself:
+
+- [Uploading a pre-built firmware build](https://emsesp.github.io/docs/#/Uploading-firmware)
+- [Building the firmware from source code and flashing manually](https://emsesp.github.io/docs/#/Building-firmware)
+
+# **Support Information**
+
+If you're looking for support on **EMS-ESP** there are some options available:
+
+## Documentation
+
+- [Official EMS-ESP Documentation](https://emsesp.github.io/docs): For information on how to build and upload the firmware
+- [FAQ and Troubleshooting](https://emsesp.github.io/docs/#/Troubleshooting): For information on common problems and solutions. See also [BBQKees's wiki](https://bbqkees-electronics.nl/wiki/gateway/troubleshooting.html)
+
+## Support Community
+
+- [Discord Server](https://discord.gg/3J3GgnzpyT): For support, troubleshooting and general questions. You have better chances to get fast answers from members of the community
+- [Search in Issues](https://github.com/emsesp/EMS-ESP32/issues): You might find an answer to your question by searching current or closed issues
+
+## Developer's Community
+
+- [Bug Report](https://github.com/emsesp/EMS-ESP32/issues/new?template=bug_report.md): For reporting Bugs
+- [Feature Request](https://github.com/emsesp/EMS-ESP32/issues/new?template=feature_request.md): For requesting features/functions
+- [Troubleshooting](https://github.com/emsesp/EMS-ESP32/issues/new?template=questions---troubleshooting.md): As a last resort, you can open new _Troubleshooting & Question_ issue on GitHub if the solution could not be found using the other channels. Just remember: the more info you provide the more chances you'll have to get an accurate answer
+
+# **Contributors ✨**
+
+EMS-ESP is a project originally created and owned by [proddy](https://github.com/proddy). Key contributors are:
+
+<!-- prettier-ignore-start -->
+<!-- markdownlint-disable -->
+<table>
+  <tr>
+    <td align="center">
+    <a href="https://github.com/MichaelDvP"><img src="https://avatars.githubusercontent.com/u/59284019?v=3?s=100" width="100px;" alt=""/><br /><sub><b>MichaelDvP</b></sub></a><br /></a> <a href="https://github.com/emsesp/EMS-ESP/commits?author=MichaelDvP" title="v2 Commits">v2</a>
+    <a href="https://github.com/emsesp/EMS-ESP32/commits?author=MichaelDvP" title="v3 Commits">v3</a>
+    </td>
+
+  </tr>
+</table>
+<!-- markdownlint-restore -->
+<!-- prettier-ignore-end -->
+
+You can also contribute to EMS-ESP by
+
+- providing Pull Requests (Features, Fixes, suggestions)
+- testing new released features and report issues on your EMS equipment
+- contributing to missing [Documentation](https://emsesp.github.io/docs)
+
+# **Libraries used**
+
+- [esp8266-react](https://github.com/rjwats/esp8266-react) by @rjwats for the framework that provides the core of the Web UI
+- [uuid-\*](https://github.com/nomis/mcu-uuid-console) from @nomis. The console, syslog, telnet and logging are based off these open source libraries
+- [ArduinoJson](https://github.com/bblanchon/ArduinoJson) for JSON
+- [AsyncMqttClient](https://github.com/marvinroger/async-mqtt-client) for the MQTT client, with custom modifications from @bertmelis and @proddy
+- ESPAsyncWebServer and AsyncTCP for the Web server and TCP backends, with custom modifications for performance
+
+# **License**
+
+This program is licensed under GPL-3.0
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -3,3 +3,4 @@
 # Firmware Installation

 Follow the instructions in the [documentation](https://emsesp.github.io/docs) on how to install the firmware binaries in the Assets below.
+
--- a/RELEASENOTES_DEV.md
+++ b/RELEASENOTES_DEV.md
@@ -5,3 +5,4 @@ This is a snapshot of the current "beta" development code and firmware binaries
 # Firmware Installation

 Follow the instructions in the [documentation](https://emsesp.github.io/docs) on how to install the firmware binaries in the Assets below.
+
--- a/esp32_partition_16M.csv
+++ b/esp32_partition_16M.csv
@@ -1,6 +0,0 @@
-# Name,   Type, SubType, Offset,   Size,    Flags
-nvs,      data, nvs,     0x9000,   0x5000,
-otadata,  data, ota,     ,         0x2000,
-app0,     app,  ota_0,   ,         0x7F0000,
-app1,     app,  ota_1,   ,         0x7F0000,
-spiffs,   data, spiffs,  ,         64K,
--- a/esp32_partition_4M.csv
+++ b/esp32_partition_4M.csv
@@ -1,6 +0,0 @@
-# Name,   Type, SubType, Offset,   Size,    Flags
-nvs,      data, nvs,     0x9000,   0x5000,
-otadata,  data, ota,     ,         0x2000,
-app0,     app,  ota_0,   ,         0x1F0000,
-app1,     app,  ota_1,   ,         0x1F0000,
-spiffs,   data, spiffs,  ,         64K,
--- a/esp32_partition_app1984k_spiffs64k.csv
+++ b/esp32_partition_app1984k_spiffs64k.csv
@@ -0,0 +1,6 @@
+# Name,   Type, SubType, Offset,   Size,    Flags
+nvs,      data, nvs,     0x9000,   0x5000,
+otadata,  data, ota,     0xE000,   0x2000,
+app0,     app,  ota_0,   0x10000,  0x1F0000,
+app1,     app,  ota_1,   0x200000, 0x1F0000,
+spiffs,   data, spiffs,  0x3F0000, 0x10000,
--- a/factory_settings.ini
+++ b/factory_settings.ini
@@ -7,8 +7,8 @@ build_flags =

 	; Access point settings
    -D FACTORY_AP_PROVISION_MODE=AP_MODE_DISCONNECTED
-    -D FACTORY_AP_SSID=\"ems-esp\"
-    -D FACTORY_AP_PASSWORD=\"ems-esp-neo\"
+    -D FACTORY_AP_SSID=\"ems-esp\" ; 1-64 characters
+    -D FACTORY_AP_PASSWORD=\"ems-esp-neo\" ; 8-64 characters
    -D FACTORY_AP_LOCAL_IP=\"192.168.4.1\"
    -D FACTORY_AP_GATEWAY_IP=\"192.168.4.1\"
    -D FACTORY_AP_SUBNET_MASK=\"255.255.255.0\"
@@ -28,11 +28,11 @@ build_flags =
    ; OTA settings
    -D FACTORY_OTA_PORT=8266
    -D FACTORY_OTA_PASSWORD=\"ems-esp-neo\"
-    -D FACTORY_OTA_ENABLED=false
+    -D FACTORY_OTA_ENABLED=true

    ; MQTT settings
    -D FACTORY_MQTT_ENABLED=false
-    -D FACTORY_MQTT_HOST=\"\"
+    -D FACTORY_MQTT_HOST=\"test.mosquitto.org\"
    -D FACTORY_MQTT_PORT=1883
    -D FACTORY_MQTT_USERNAME=\"\"
    -D FACTORY_MQTT_PASSWORD=\"\"
--- a/interface/.typesafe-i18n.json
+++ b/interface/.typesafe-i18n.json
@@ -1,5 +0,0 @@
-{
-   "adapter": "react",
-   "baseLocale": "pl",
-   "$schema": "https://unpkg.com/typesafe-i18n@5.24.1/schema/typesafe-i18n.json"
-}
--- a/interface/package-lock.json
+++ b/interface/package-lock.json
--- a/interface/package.json
+++ b/interface/package.json
@@ -1,35 +1,36 @@
 {
  "name": "EMS-ESP",
-  "version": "3.5.0",
+  "version": "3.4.0",
  "private": true,
  "proxy": "http://localhost:3080",
  "dependencies": {
-    "@emotion/react": "^11.10.6",
-    "@emotion/styled": "^11.10.6",
-    "@msgpack/msgpack": "^2.8.0",
-    "@mui/icons-material": "^5.11.9",
-    "@mui/material": "^5.11.10",
-    "@table-library/react-table-library": "4.0.26",
-    "@types/lodash": "^4.14.191",
-    "@types/node": "^18.14.0",
-    "@types/react": "^18.0.28",
-    "@types/react-dom": "^18.0.11",
+    "@emotion/react": "^11.9.0",
+    "@emotion/styled": "^11.8.1",
+    "@msgpack/msgpack": "^2.7.2",
+    "@mui/icons-material": "^5.8.0",
+    "@mui/material": "^5.8.1",
+    "@table-library/react-table-library": "^3.1.2",
+    "@types/lodash": "^4.14.182",
+    "@types/node": "^17.0.35",
+    "@types/react": "^18.0.9",
+    "@types/react-dom": "^18.0.5",
    "@types/react-router-dom": "^5.3.3",
-    "async-validator": "^4.2.5",
-    "axios": "^1.3.4",
+    "async-validator": "^4.1.1",
+    "axios": "^0.27.2",
+    "http-proxy-middleware": "^2.0.6",
    "jwt-decode": "^3.1.2",
    "lodash": "^4.17.21",
-    "notistack": "^2.0.8",
-    "react": "^18.2.0",
+    "notistack": "^2.0.5",
+    "parse-ms": "^3.0.0",
+    "react": "^18.1.0",
    "react-app-rewired": "^2.2.1",
-    "react-dom": "^18.2.0",
-    "react-dropzone": "^14.2.3",
-    "react-icons": "^4.7.1",
-    "react-router-dom": "^6.8.1",
+    "react-dom": "^18.1.0",
+    "react-dropzone": "^14.2.1",
+    "react-icons": "^4.3.1",
+    "react-router-dom": "^6.3.0",
    "react-scripts": "5.0.1",
    "sockette": "^2.0.6",
-    "typesafe-i18n": "^5.24.1",
-    "typescript": "^4.9.5"
+    "typescript": "^4.6.4"
  },
  "scripts": {
    "start": "react-app-rewired start",
@@ -40,9 +41,8 @@
    "build-hosted": "env-cmd -f .env.hosted npm run build",
    "build-localhost": "PUBLIC_URL=/ react-app-rewired build",
    "mock-api": "nodemon --watch ../mock-api ../mock-api/server.js",
-    "standalone": "npm-run-all -p start typesafe-i18n mock-api",
-    "lint": "eslint . --ext .ts,.tsx",
-    "typesafe-i18n": "typesafe-i18n"
+    "standalone": "npm-run-all -p start mock-api",
+    "lint": "eslint . --ext .ts,.tsx"
  },
  "eslintConfig": {
    "extends": [
@@ -78,7 +78,7 @@
      "max-len": [
        1,
        {
-          "code": 220
+          "code": 200
        }
      ],
      "arrow-parens": 1
@@ -97,8 +97,7 @@
    ]
  },
  "devDependencies": {
-    "nodemon": "^2.0.20",
-    "npm-run-all": "^4.1.5",
-    "http-proxy-middleware": "^2.0.6"
+    "nodemon": "^2.0.16",
+    "npm-run-all": "^4.1.5"
  }
 }
--- a/interface/public/css/roboto.css
+++ b/interface/public/css/roboto.css
@@ -10,9 +10,8 @@
  font-style: normal;
  font-weight: 400;
  src: local('Roboto'), local('Roboto-Regular'), url(../fonts/re.woff2) format('woff2');
-  unicode-range: U+0000-00FF, U+0104-0107, U+0118-0119, U+0131, U+0141-0144, U+0152-0153, U+015A-015B, U+0179-017C,
-    U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF,
-    U+FFFD;
+  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC,
+    U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
 }

@font-face {
@@ -20,7 +19,6 @@
  font-style: normal;
  font-weight: 500;
  src: local('Roboto Medium'), local('Roboto-Medium'), url(../fonts/md.woff2) format('woff2');
-  unicode-range: U+0000-00FF, U+0104-0107, U+0118-0119, U+0131, U+0141-0144, U+0152-0153, U+015A-015B, U+0179-017C,
-    U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF,
-    U+FFFD;
+  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC,
+    U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
 }
--- a/interface/public/fonts/md.woff2
+++ b/interface/public/fonts/md.woff2
--- a/interface/public/fonts/re.woff2
+++ b/interface/public/fonts/re.woff2
--- a/interface/src/App.tsx
+++ b/interface/src/App.tsx
@@ -1,4 +1,4 @@
-import { FC, createRef, createContext, useContext, useEffect, useState, RefObject } from 'react';
+import { FC, createRef, createContext, useContext, RefObject } from 'react';
 import { SnackbarProvider } from 'notistack';

 import { IconButton } from '@mui/material';
@@ -9,13 +9,6 @@ import { FeaturesLoader } from './contexts/features';
 import CustomTheme from './CustomTheme';
 import AppRouting from './AppRouting';

-import { localStorageDetector } from 'typesafe-i18n/detectors';
-import TypesafeI18n from './i18n/i18n-react';
-import { detectLocale } from './i18n/i18n-util';
-import { loadLocaleAsync } from './i18n/i18n-util.async';
-
-const detectedLocale = detectLocale(localStorageDetector);
-
 const App: FC = () => {
  const notistackRef: RefObject<any> = createRef();

@@ -27,34 +20,24 @@ const App: FC = () => {

  const colorMode = useContext(ColorModeContext);

-  const [wasLoaded, setWasLoaded] = useState(false);
-
-  useEffect(() => {
-    loadLocaleAsync(detectedLocale).then(() => setWasLoaded(true));
-  }, []);
-
-  if (!wasLoaded) return null;
-
  return (
    <ColorModeContext.Provider value={colorMode}>
-      <TypesafeI18n locale={detectedLocale}>
-        <CustomTheme>
-          <SnackbarProvider
-            maxSnack={3}
-            anchorOrigin={{ vertical: 'bottom', horizontal: 'left' }}
-            ref={notistackRef}
-            action={(key) => (
-              <IconButton onClick={onClickDismiss(key)} size="small">
-                <CloseIcon />
-              </IconButton>
-            )}
-          >
-            <FeaturesLoader>
-              <AppRouting />
-            </FeaturesLoader>
-          </SnackbarProvider>
-        </CustomTheme>
-      </TypesafeI18n>
+      <CustomTheme>
+        <SnackbarProvider
+          maxSnack={3}
+          anchorOrigin={{ vertical: 'bottom', horizontal: 'left' }}
+          ref={notistackRef}
+          action={(key) => (
+            <IconButton onClick={onClickDismiss(key)} size="small">
+              <CloseIcon />
+            </IconButton>
+          )}
+        >
+          <FeaturesLoader>
+            <AppRouting />
+          </FeaturesLoader>
+        </SnackbarProvider>
+      </CustomTheme>
    </ColorModeContext.Provider>
  );
 };
--- a/interface/src/AppRouting.tsx
+++ b/interface/src/AppRouting.tsx
@@ -2,8 +2,6 @@ import { FC, useContext, useEffect } from 'react';
 import { Navigate, Routes, Route, useLocation } from 'react-router-dom';
 import { useSnackbar, VariantType } from 'notistack';

-import { useI18nContext } from './i18n/i18n-react';
-
 import { Authentication, AuthenticationContext } from './contexts/authentication';
 import { FeaturesContext } from './contexts/features';
 import { RequireAuthenticated, RequireUnauthenticated } from './components';
@@ -43,14 +41,13 @@ export const RemoveTrailingSlashes = () => {

 const AppRouting: FC = () => {
  const { features } = useContext(FeaturesContext);
-  const { LL } = useI18nContext();

  return (
    <Authentication>
      <RemoveTrailingSlashes />
      <Routes>
-        <Route path="/unauthorized" element={<RootRedirect message={LL.PLEASE_SIGNIN()} signOut />} />
-        <Route path="/fileUpdated" element={<RootRedirect message={LL.UPLOAD_SUCCESSFUL()} variant="success" />} />
+        <Route path="/unauthorized" element={<RootRedirect message="Please sign in to continue" signOut />} />
+        <Route path="/fileUpdated" element={<RootRedirect message="Upload successful" variant="success" />} />
        {features.security && (
          <Route
            path="/"
--- a/interface/src/SignIn.tsx
+++ b/interface/src/SignIn.tsx
@@ -2,30 +2,20 @@ import { FC, useContext, useState } from 'react';
 import { ValidateFieldsError } from 'async-validator';
 import { useSnackbar } from 'notistack';

-import { Box, Fab, Paper, Typography, Button } from '@mui/material';
+import { Box, Fab, Paper, Typography } from '@mui/material';
 import ForwardIcon from '@mui/icons-material/Forward';

 import * as AuthenticationApi from './api/authentication';
 import { PROJECT_NAME } from './api/env';
 import { AuthenticationContext } from './contexts/authentication';

+import { AxiosError } from 'axios';
+
 import { extractErrorMessage, onEnterCallback, updateValue } from './utils';
 import { SignInRequest } from './types';
 import { ValidatedTextField } from './components';
 import { SIGN_IN_REQUEST_VALIDATOR, validate } from './validators';

-import { I18nContext } from './i18n/i18n-react';
-import type { Locales } from './i18n/i18n-types';
-import { loadLocaleAsync } from './i18n/i18n-util.async';
-
-import { ReactComponent as NLflag } from './i18n/NL.svg';
-import { ReactComponent as DEflag } from './i18n/DE.svg';
-import { ReactComponent as GBflag } from './i18n/GB.svg';
-import { ReactComponent as SVflag } from './i18n/SV.svg';
-import { ReactComponent as PLflag } from './i18n/PL.svg';
-import { ReactComponent as NOflag } from './i18n/NO.svg';
-import { ReactComponent as FRflag } from './i18n/FR.svg';
-
 const SignIn: FC = () => {
  const authenticationContext = useContext(AuthenticationContext);
  const { enqueueSnackbar } = useSnackbar();
@@ -41,9 +31,6 @@ const SignIn: FC = () => {

  const validateAndSignIn = async () => {
    setProcessing(true);
-    SIGN_IN_REQUEST_VALIDATOR.messages({
-      required: LL.IS_REQUIRED('%s')
-    });
    try {
      await validate(SIGN_IN_REQUEST_VALIDATOR, signInRequest);
      signIn();
@@ -57,13 +44,13 @@ const SignIn: FC = () => {
    try {
      const { data: loginResponse } = await AuthenticationApi.signIn(signInRequest);
      authenticationContext.signIn(loginResponse.access_token);
-    } catch (error) {
-      if (error.response) {
+    } catch (error: unknown) {
+      if (error instanceof AxiosError) {
        if (error.response?.status === 401) {
-          enqueueSnackbar(LL.INVALID_LOGIN(), { variant: 'warning' });
+          enqueueSnackbar('Invalid login details', { variant: 'warning' });
        }
      } else {
-        enqueueSnackbar(extractErrorMessage(error, LL.ERROR()), { variant: 'error' });
+        enqueueSnackbar(extractErrorMessage(error, 'Unexpected error, please try again'), { variant: 'error' });
      }
      setProcessing(false);
    }
@@ -71,14 +58,6 @@ const SignIn: FC = () => {

  const submitOnEnter = onEnterCallback(signIn);

-  const { LL, setLocale, locale } = useContext(I18nContext);
-
-  const selectLocale = async (loc: Locales) => {
-    localStorage.setItem('lang', loc);
-    await loadLocaleAsync(loc);
-    setLocale(loc);
-  };
-
  return (
    <Box
      display="flex"
@@ -102,49 +81,11 @@ const SignIn: FC = () => {
        })}
      >
        <Typography variant="h4">{PROJECT_NAME}</Typography>
-        <Box
-          sx={{
-            '& button, & a, & .MuiCard-root': {
-              mt: 0.5,
-              mx: 0.5
-            }
-          }}
-        >
-          <Button size="small" variant={locale === 'en' ? 'contained' : 'outlined'} onClick={() => selectLocale('en')}>
-            <GBflag style={{ width: 24 }} />
-            &nbsp;EN
-          </Button>
-          <Button size="small" variant={locale === 'de' ? 'contained' : 'outlined'} onClick={() => selectLocale('de')}>
-            <DEflag style={{ width: 24 }} />
-            &nbsp;DE
-          </Button>
-          <Button size="small" variant={locale === 'fr' ? 'contained' : 'outlined'} onClick={() => selectLocale('fr')}>
-            <FRflag style={{ width: 24 }} />
-            &nbsp;FR
-          </Button>
-          <Button size="small" variant={locale === 'nl' ? 'contained' : 'outlined'} onClick={() => selectLocale('nl')}>
-            <NLflag style={{ width: 24 }} />
-            &nbsp;NL
-          </Button>
-          <Button size="small" variant={locale === 'no' ? 'contained' : 'outlined'} onClick={() => selectLocale('no')}>
-            <NOflag style={{ width: 24 }} />
-            &nbsp;NO
-          </Button>
-          <Button size="small" variant={locale === 'pl' ? 'contained' : 'outlined'} onClick={() => selectLocale('pl')}>
-            <PLflag style={{ width: 24 }} />
-            &nbsp;PL
-          </Button>
-          <Button size="small" variant={locale === 'sv' ? 'contained' : 'outlined'} onClick={() => selectLocale('sv')}>
-            <SVflag style={{ width: 24 }} />
-            &nbsp;SV
-          </Button>
-        </Box>
-
        <ValidatedTextField
          fieldErrors={fieldErrors}
          disabled={processing}
          name="username"
-          label={LL.USERNAME(0)}
+          label="Username"
          value={signInRequest.username}
          onChange={updateLoginRequestValue}
          margin="normal"
@@ -156,7 +97,7 @@ const SignIn: FC = () => {
          disabled={processing}
          type="password"
          name="password"
-          label={LL.PASSWORD()}
+          label="Password"
          value={signInRequest.password}
          onChange={updateLoginRequestValue}
          onKeyDown={submitOnEnter}
@@ -166,7 +107,7 @@ const SignIn: FC = () => {
        />
        <Fab variant="extended" color="primary" sx={{ mt: 2 }} onClick={validateAndSignIn} disabled={processing}>
          <ForwardIcon sx={{ mr: 1 }} />
-          {LL.SIGN_IN()}
+          Sign In
        </Fab>
      </Paper>
    </Box>
--- a/interface/src/api/endpoints.ts
+++ b/interface/src/api/endpoints.ts
@@ -1,4 +1,4 @@
-import axios, { AxiosPromise, CancelToken, AxiosProgressEvent } from 'axios';
+import axios, { AxiosPromise, CancelToken } from 'axios';

 import { decode } from '@msgpack/msgpack';

@@ -89,7 +89,7 @@ function calculateEventSourceRoot(endpointPath: string) {

 export interface FileUploadConfig {
  cancelToken?: CancelToken;
-  onUploadProgress?: (progressEvent: AxiosProgressEvent) => void;
+  onUploadProgress?: (progressEvent: ProgressEvent) => void;
 }

 export const startUploadFile = (url: string, file: File, config?: FileUploadConfig): AxiosPromise<void> => {
--- a/interface/src/api/mqtt.ts
+++ b/interface/src/api/mqtt.ts
@@ -11,6 +11,6 @@ export function readMqttSettings(): AxiosPromise<MqttSettings> {
  return AXIOS.get('/mqttSettings');
 }

-export function updateMqttSettings(mqttSettings: MqttSettings): AxiosPromise<MqttSettings> {
-  return AXIOS.post('/mqttSettings', mqttSettings);
+export function updateMqttSettings(ntpSettings: MqttSettings): AxiosPromise<MqttSettings> {
+  return AXIOS.post('/mqttSettings', ntpSettings);
 }
--- a/interface/src/api/system.ts
+++ b/interface/src/api/system.ts
@@ -12,10 +12,6 @@ export function restart(): AxiosPromise<void> {
  return AXIOS.post('/restart');
 }

-export function partition(): AxiosPromise<void> {
-  return AXIOS.post('/partition');
-}
-
 export function factoryReset(): AxiosPromise<void> {
  return AXIOS.post('/factoryReset');
 }
@@ -42,3 +38,4 @@ export function updateLogSettings(logSettings: LogSettings): AxiosPromise<LogSet
 export function readLogEntries(): AxiosPromise<LogEntries> {
  return AXIOS_BIN.get('/fetchLog');
 }
+
--- a/interface/src/components/layout/LayoutAuthMenu.tsx
+++ b/interface/src/components/layout/LayoutAuthMenu.tsx
@@ -1,36 +1,12 @@
-import { FC, useState, useContext, ChangeEventHandler } from 'react';
+import { FC, useState, useContext } from 'react';

-import {
-  Box,
-  Button,
-  Divider,
-  IconButton,
-  Popover,
-  Typography,
-  Avatar,
-  styled,
-  TypographyProps,
-  MenuItem,
-  TextField
-} from '@mui/material';
+import { Box, Button, Divider, IconButton, Popover, Typography, Avatar, styled, TypographyProps } from '@mui/material';

 import PersonIcon from '@mui/icons-material/Person';
 import AccountCircleIcon from '@mui/icons-material/AccountCircle';

 import { AuthenticatedContext } from '../../contexts/authentication';

-import { I18nContext } from '../../i18n/i18n-react';
-import type { Locales } from '../../i18n/i18n-types';
-import { loadLocaleAsync } from '../../i18n/i18n-util.async';
-
-import { ReactComponent as NLflag } from '../../i18n/NL.svg';
-import { ReactComponent as DEflag } from '../../i18n/DE.svg';
-import { ReactComponent as GBflag } from '../../i18n/GB.svg';
-import { ReactComponent as SVflag } from '../../i18n/SV.svg';
-import { ReactComponent as PLflag } from '../../i18n/PL.svg';
-import { ReactComponent as NOflag } from '../../i18n/NO.svg';
-import { ReactComponent as FRflag } from '../../i18n/FR.svg';
-
 const ItemTypography = styled(Typography)<TypographyProps>({
  maxWidth: '250px',
  whiteSpace: 'nowrap',
@@ -47,15 +23,6 @@ const LayoutAuthMenu: FC = () => {
    setAnchorEl(event.currentTarget);
  };

-  const { locale, LL, setLocale } = useContext(I18nContext);
-
-  const onLocaleSelected: ChangeEventHandler<HTMLInputElement> = async ({ target }) => {
-    const loc = target.value as Locales;
-    localStorage.setItem('lang', loc);
-    await loadLocaleAsync(loc);
-    setLocale(loc);
-  };
-
  const handleClose = () => {
    setAnchorEl(null);
  };
@@ -65,53 +32,7 @@ const LayoutAuthMenu: FC = () => {

  return (
    <>
-      <TextField
-        name="locale"
-        InputProps={{ style: { fontSize: 10 } }}
-        variant="outlined"
-        value={locale}
-        onChange={onLocaleSelected}
-        size="small"
-        select
-      >
-        <MenuItem key="en" value="en">
-          <GBflag style={{ width: 16, verticalAlign: 'middle' }} />
-          &nbsp;EN
-        </MenuItem>
-        <Divider />
-        <MenuItem key="de" value="de">
-          <DEflag style={{ width: 16, verticalAlign: 'middle' }} />
-          &nbsp;DE
-        </MenuItem>
-        <MenuItem key="fr" value="fr">
-          <FRflag style={{ width: 16, verticalAlign: 'middle' }} />
-          &nbsp;FR
-        </MenuItem>
-        <MenuItem key="nl" value="nl">
-          <NLflag style={{ width: 16, verticalAlign: 'middle' }} />
-          &nbsp;NL
-        </MenuItem>
-        <MenuItem key="no" value="no">
-          <NOflag style={{ width: 16, verticalAlign: 'middle' }} />
-          &nbsp;NO
-        </MenuItem>
-        <MenuItem key="pl" value="pl">
-          <PLflag style={{ width: 16, verticalAlign: 'middle' }} />
-          &nbsp;PL
-        </MenuItem>
-        <MenuItem key="sv" value="sv">
-          <SVflag style={{ width: 16, verticalAlign: 'middle' }} />
-          &nbsp;SV
-        </MenuItem>
-      </TextField>
-
-      <IconButton
-        id="open-auth-menu"
-        sx={{ ml: 1, padding: 0 }}
-        aria-describedby={id}
-        color="inherit"
-        onClick={handleClick}
-      >
+      <IconButton id="open-auth-menu" sx={{ padding: 0 }} aria-describedby={id} color="inherit" onClick={handleClick}>
        <AccountCircleIcon />
      </IconButton>
      <Popover
@@ -135,15 +56,13 @@ const LayoutAuthMenu: FC = () => {
          </Avatar>
          <Box pl={2}>
            <ItemTypography variant="h6">{me.username}</ItemTypography>
-            <ItemTypography variant="body1">
-              {me.admin ? LL.ADMIN() : LL.GUEST()}&nbsp;{LL.USER(2)}
-            </ItemTypography>
+            <ItemTypography variant="body1">{me.admin ? 'Admin User' : 'Guest User'}</ItemTypography>
          </Box>
        </Box>
        <Divider />
        <Box p={1.5}>
          <Button variant="outlined" fullWidth color="primary" onClick={() => signOut(true)}>
-            {LL.SIGN_OUT()}
+            Sign Out
          </Button>
        </Box>
      </Popover>
--- a/interface/src/components/layout/LayoutMenu.tsx
+++ b/interface/src/components/layout/LayoutMenu.tsx
@@ -15,12 +15,9 @@ import ProjectMenu from '../../project/ProjectMenu';
 import LayoutMenuItem from './LayoutMenuItem';
 import { AuthenticatedContext } from '../../contexts/authentication';

-import { useI18nContext } from '../../i18n/i18n-react';
-
 const LayoutMenu: FC = () => {
  const { features } = useContext(FeaturesContext);
  const authenticatedContext = useContext(AuthenticatedContext);
-  const { LL } = useI18nContext();

  return (
    <>
@@ -31,17 +28,12 @@ const LayoutMenu: FC = () => {
        </List>
      )}
      <List disablePadding component="nav">
-        <LayoutMenuItem icon={SettingsEthernetIcon} label={LL.NETWORK(0)} to="/network" />
-        <LayoutMenuItem icon={SettingsInputAntennaIcon} label={LL.ACCESS_POINT(0)} to="/ap" />
-        {features.ntp && <LayoutMenuItem icon={AccessTimeIcon} label="NTP" to="/ntp" />}
+        <LayoutMenuItem icon={SettingsEthernetIcon} label="Network Connection" to="/network" />
+        <LayoutMenuItem icon={SettingsInputAntennaIcon} label="Access Point" to="/ap" />
+        {features.ntp && <LayoutMenuItem icon={AccessTimeIcon} label="Network Time" to="/ntp" />}
        {features.mqtt && <LayoutMenuItem icon={DeviceHubIcon} label="MQTT" to="/mqtt" />}
-        <LayoutMenuItem
-          icon={LockIcon}
-          label={LL.SECURITY(0)}
-          to="/security"
-          disabled={!authenticatedContext.me.admin}
-        />
-        <LayoutMenuItem icon={SettingsIcon} label={LL.SYSTEM(0)} to="/system" />
+        <LayoutMenuItem icon={LockIcon} label="Security" to="/security" disabled={!authenticatedContext.me.admin} />
+        <LayoutMenuItem icon={SettingsIcon} label="System" to="/system" />
      </List>
    </>
  );
--- a/interface/src/components/loading/FormLoader.tsx
+++ b/interface/src/components/loading/FormLoader.tsx
@@ -5,8 +5,6 @@ import RefreshIcon from '@mui/icons-material/Refresh';

 import { MessageBox } from '..';

-import { useI18nContext } from '../../i18n/i18n-react';
-
 interface FormLoaderProps {
  message?: string;
  errorMessage?: string;
@@ -14,14 +12,12 @@ interface FormLoaderProps {
 }

 const FormLoader: FC<FormLoaderProps> = ({ errorMessage, onRetry, message = 'Loading…' }) => {
-  const { LL } = useI18nContext();
-
  if (errorMessage) {
    return (
      <MessageBox my={2} level="error" message={errorMessage}>
        {onRetry && (
          <Button startIcon={<RefreshIcon />} variant="contained" color="error" onClick={onRetry}>
-            {LL.RETRY()}
+            Retry
          </Button>
        )}
      </MessageBox>
--- a/interface/src/components/loading/LoadingSpinner.tsx
+++ b/interface/src/components/loading/LoadingSpinner.tsx
@@ -2,29 +2,23 @@ import { FC } from 'react';

 import { CircularProgress, Box, Typography, Theme } from '@mui/material';

-import { useI18nContext } from '../../i18n/i18n-react';
-
 interface LoadingSpinnerProps {
  height?: number | string;
 }

-const LoadingSpinner: FC<LoadingSpinnerProps> = ({ height = '100%' }) => {
-  const { LL } = useI18nContext();
-
-  return (
-    <Box display="flex" alignItems="center" justifyContent="center" flexDirection="column" padding={2} height={height}>
-      <CircularProgress
-        sx={(theme: Theme) => ({
-          margin: theme.spacing(4),
-          color: theme.palette.text.secondary
-        })}
-        size={100}
-      />
-      <Typography variant="h4" color="textSecondary">
-        {LL.LOADING()}&hellip;
-      </Typography>
-    </Box>
-  );
-};
+const LoadingSpinner: FC<LoadingSpinnerProps> = ({ height = '100%' }) => (
+  <Box display="flex" alignItems="center" justifyContent="center" flexDirection="column" padding={2} height={height}>
+    <CircularProgress
+      sx={(theme: Theme) => ({
+        margin: theme.spacing(4),
+        color: theme.palette.text.secondary
+      })}
+      size={100}
+    />
+    <Typography variant="h4" color="textSecondary">
+      Loading&hellip;
+    </Typography>
+  </Box>
+);

 export default LoadingSpinner;
--- a/interface/src/components/upload/SingleUpload.tsx
+++ b/interface/src/components/upload/SingleUpload.tsx
@@ -1,14 +1,12 @@
 import { FC, Fragment } from 'react';
 import { useDropzone, DropzoneState } from 'react-dropzone';

-import { AxiosProgressEvent } from 'axios';
-
 import { Box, Button, LinearProgress, Theme, Typography, useTheme } from '@mui/material';

 import CloudUploadIcon from '@mui/icons-material/CloudUpload';
 import CancelIcon from '@mui/icons-material/Cancel';

-import { useI18nContext } from '../../i18n/i18n-react';
+const progressPercentage = (progress: ProgressEvent) => Math.round((progress.loaded * 100) / progress.total);

 const getBorderColor = (theme: Theme, props: DropzoneState) => {
  if (props.isDragAccept) {
@@ -27,7 +25,7 @@ export interface SingleUploadProps {
  onDrop: (acceptedFiles: File[]) => void;
  onCancel: () => void;
  uploading: boolean;
-  progress?: AxiosProgressEvent;
+  progress?: ProgressEvent;
 }

 const SingleUpload: FC<SingleUploadProps> = ({ onDrop, onCancel, uploading, progress }) => {
@@ -35,8 +33,7 @@ const SingleUpload: FC<SingleUploadProps> = ({ onDrop, onCancel, uploading, prog
    onDrop,
    accept: {
      'application/octet-stream': ['.bin'],
-      'application/json': ['.json'],
-      'text/plain': ['.md5']
+      'application/json': ['.json']
    },
    disabled: uploading,
    multiple: false
@@ -44,16 +41,14 @@ const SingleUpload: FC<SingleUploadProps> = ({ onDrop, onCancel, uploading, prog
  const { getRootProps, getInputProps } = dropzoneState;
  const theme = useTheme();

-  const { LL } = useI18nContext();
-
  const progressText = () => {
    if (uploading) {
-      if (progress?.total) {
-        return LL.UPLOADING() + ': ' + Math.round((progress.loaded * 100) / progress.total) + '%';
+      if (progress?.lengthComputable) {
+        return `Uploading: ${progressPercentage(progress)}%`;
      }
-      return LL.UPLOADING() + `\u2026`;
+      return 'Uploading\u2026';
    }
-    return LL.UPLOAD_DROP_TEXT();
+    return 'Drop file or click here';
  };

  return (
@@ -65,7 +60,7 @@ const SingleUpload: FC<SingleUploadProps> = ({ onDrop, onCancel, uploading, prog
          borderWidth: 2,
          borderRadius: 2,
          borderStyle: 'dashed',
-          color: theme.palette.grey[400],
+          color: theme.palette.grey[700],
          transition: 'border .24s ease-in-out',
          width: '100%',
          cursor: uploading ? 'default' : 'pointer',
@@ -81,12 +76,12 @@ const SingleUpload: FC<SingleUploadProps> = ({ onDrop, onCancel, uploading, prog
          <Fragment>
            <Box width="100%" p={2}>
              <LinearProgress
-                variant={!progress || progress.total ? 'determinate' : 'indeterminate'}
-                value={!progress ? 0 : progress.total ? Math.round((progress.loaded * 100) / progress.total) : 0}
+                variant={!progress || progress.lengthComputable ? 'determinate' : 'indeterminate'}
+                value={!progress ? 0 : progress.lengthComputable ? progressPercentage(progress) : 0}
              />
            </Box>
            <Button startIcon={<CancelIcon />} variant="outlined" color="secondary" onClick={onCancel}>
-              {LL.CANCEL()}
+              Cancel
            </Button>
          </Fragment>
        )}
--- a/interface/src/components/upload/useFileUpload.ts
+++ b/interface/src/components/upload/useFileUpload.ts
@@ -1,30 +1,24 @@
 import { useCallback, useEffect, useState } from 'react';
-import axios, { AxiosPromise, CancelTokenSource, AxiosProgressEvent } from 'axios';
+import axios, { AxiosPromise, CancelTokenSource } from 'axios';
 import { useSnackbar } from 'notistack';

 import { extractErrorMessage } from '../../utils';
 import { FileUploadConfig } from '../../api/endpoints';

-import { useI18nContext } from '../../i18n/i18n-react';
-
 interface MediaUploadOptions {
  upload: (file: File, config?: FileUploadConfig) => AxiosPromise<void>;
 }

 const useFileUpload = ({ upload }: MediaUploadOptions) => {
-  const { LL } = useI18nContext();
-
  const { enqueueSnackbar } = useSnackbar();
  const [uploading, setUploading] = useState<boolean>(false);
-  const [md5, setMd5] = useState<string>('');
-  const [uploadProgress, setUploadProgress] = useState<AxiosProgressEvent>();
+  const [uploadProgress, setUploadProgress] = useState<ProgressEvent>();
  const [uploadCancelToken, setUploadCancelToken] = useState<CancelTokenSource>();

  const resetUploadingStates = () => {
    setUploading(false);
    setUploadProgress(undefined);
    setUploadCancelToken(undefined);
-    setMd5('');
  };

  const cancelUpload = useCallback(() => {
@@ -43,28 +37,23 @@ const useFileUpload = ({ upload }: MediaUploadOptions) => {
      const cancelToken = axios.CancelToken.source();
      setUploadCancelToken(cancelToken);
      setUploading(true);
-      const response = await upload(images[0], {
+      await upload(images[0], {
        onUploadProgress: setUploadProgress,
        cancelToken: cancelToken.token
      });
      resetUploadingStates();
-      if (response.status === 200) {
-        enqueueSnackbar(LL.UPLOAD() + ' ' + LL.SUCCESSFUL(), { variant: 'success' });
-      } else if (response.status === 201) {
-        setMd5(String(response.data));
-        enqueueSnackbar(LL.UPLOAD() + ' MD5 ' + LL.SUCCESSFUL(), { variant: 'success' });
-      }
-    } catch (error) {
+      enqueueSnackbar('File uploaded', { variant: 'success' });
+    } catch (error: unknown) {
      if (axios.isCancel(error)) {
-        enqueueSnackbar(LL.UPLOAD() + ' ' + LL.ABORTED(), { variant: 'warning' });
+        enqueueSnackbar('Upload aborted', { variant: 'warning' });
      } else {
        resetUploadingStates();
-        enqueueSnackbar(extractErrorMessage(error, LL.UPLOAD() + ' ' + LL.FAILED()), { variant: 'error' });
+        enqueueSnackbar(extractErrorMessage(error, 'Upload failed'), { variant: 'error' });
      }
    }
  };

-  return [uploadFile, cancelUpload, uploading, uploadProgress, md5] as const;
+  return [uploadFile, cancelUpload, uploading, uploadProgress] as const;
 };

 export default useFileUpload;
--- a/interface/src/contexts/authentication/Authentication.tsx
+++ b/interface/src/contexts/authentication/Authentication.tsx
@@ -2,8 +2,6 @@ import { FC, useCallback, useContext, useEffect, useState } from 'react';
 import { useSnackbar } from 'notistack';
 import { useNavigate } from 'react-router-dom';

-import { useI18nContext } from '../../i18n/i18n-react';
-
 import * as AuthenticationApi from '../../api/authentication';
 import { ACCESS_TOKEN } from '../../api/endpoints';
 import { RequiredChildrenProps } from '../../utils';
@@ -14,8 +12,6 @@ import { AuthenticationContext } from './context';

 const Authentication: FC<RequiredChildrenProps> = ({ children }) => {
  const { features } = useContext(FeaturesContext);
-  const { LL } = useI18nContext();
-
  const navigate = useNavigate();
  const { enqueueSnackbar } = useSnackbar();

@@ -27,8 +23,8 @@ const Authentication: FC<RequiredChildrenProps> = ({ children }) => {
      AuthenticationApi.getStorage().setItem(ACCESS_TOKEN, accessToken);
      const decodedMe = AuthenticationApi.decodeMeJWT(accessToken);
      setMe(decodedMe);
-      enqueueSnackbar(LL.LOGGED_IN({ name: decodedMe.username }), { variant: 'success' });
-    } catch (error) {
+      enqueueSnackbar(`Logged in as ${decodedMe.username}`, { variant: 'success' });
+    } catch (error: unknown) {
      setMe(undefined);
      throw new Error('Failed to parse JWT');
    }
@@ -54,7 +50,7 @@ const Authentication: FC<RequiredChildrenProps> = ({ children }) => {
        await AuthenticationApi.verifyAuthorization();
        setMe(AuthenticationApi.decodeMeJWT(accessToken));
        setInitialized(true);
-      } catch (error) {
+      } catch (error: unknown) {
        setMe(undefined);
        setInitialized(true);
      }
--- a/interface/src/contexts/features/FeaturesLoader.tsx
+++ b/interface/src/contexts/features/FeaturesLoader.tsx
@@ -16,7 +16,7 @@ const FeaturesLoader: FC<RequiredChildrenProps> = (props) => {
    try {
      const response = await FeaturesApi.readFeatures();
      setFeatures(response.data);
-    } catch (error) {
+    } catch (error: unknown) {
      setErrorMessage(extractErrorMessage(error, 'Failed to fetch application details.'));
    }
  }, []);
--- a/interface/src/framework/ap/APSettingsForm.tsx
+++ b/interface/src/framework/ap/APSettingsForm.tsx
@@ -19,8 +19,6 @@ import { APProvisionMode, APSettings } from '../../types';
 import { numberValue, updateValue, useRest } from '../../utils';
 import * as APApi from '../../api/ap';

-import { useI18nContext } from '../../i18n/i18n-react';
-
 export const isAPEnabled = ({ provision_mode }: APSettings) => {
  return provision_mode === APProvisionMode.AP_MODE_ALWAYS || provision_mode === APProvisionMode.AP_MODE_DISCONNECTED;
 };
@@ -31,8 +29,6 @@ const APSettingsForm: FC = () => {
    update: APApi.updateAPSettings
  });

-  const { LL } = useI18nContext();
-
  const [fieldErrors, setFieldErrors] = useState<ValidateFieldsError>();

  const updateFormValue = updateValue(setData);
@@ -57,7 +53,7 @@ const APSettingsForm: FC = () => {
        <ValidatedTextField
          fieldErrors={fieldErrors}
          name="provision_mode"
-          label={LL.AP_PROVIDE() + '...'}
+          label="Provide Access Point&hellip;"
          value={data.provision_mode}
          fullWidth
          select
@@ -65,16 +61,16 @@ const APSettingsForm: FC = () => {
          onChange={updateFormValue}
          margin="normal"
        >
-          <MenuItem value={APProvisionMode.AP_MODE_ALWAYS}>{LL.AP_PROVIDE_TEXT_1()}</MenuItem>
-          <MenuItem value={APProvisionMode.AP_MODE_DISCONNECTED}>{LL.AP_PROVIDE_TEXT_2()}</MenuItem>
-          <MenuItem value={APProvisionMode.AP_NEVER}>{LL.AP_PROVIDE_TEXT_3()}</MenuItem>
+          <MenuItem value={APProvisionMode.AP_MODE_ALWAYS}>Always</MenuItem>
+          <MenuItem value={APProvisionMode.AP_MODE_DISCONNECTED}>When WiFi Disconnected</MenuItem>
+          <MenuItem value={APProvisionMode.AP_NEVER}>Never</MenuItem>
        </ValidatedTextField>
        {isAPEnabled(data) && (
          <>
            <ValidatedTextField
              fieldErrors={fieldErrors}
              name="ssid"
-              label={LL.ACCESS_POINT(2) + ' SSID'}
+              label="Access Point SSID"
              fullWidth
              variant="outlined"
              value={data.ssid}
@@ -84,7 +80,7 @@ const APSettingsForm: FC = () => {
            <ValidatedPasswordField
              fieldErrors={fieldErrors}
              name="password"
-              label={LL.ACCESS_POINT(2) + ' ' + LL.PASSWORD()}
+              label="Access Point Password"
              fullWidth
              variant="outlined"
              value={data.password}
@@ -94,7 +90,7 @@ const APSettingsForm: FC = () => {
            <ValidatedTextField
              fieldErrors={fieldErrors}
              name="channel"
-              label={LL.AP_PREFERRED_CHANNEL()}
+              label="Preferred Channel"
              value={numberValue(data.channel)}
              fullWidth
              select
@@ -111,12 +107,12 @@ const APSettingsForm: FC = () => {
            </ValidatedTextField>
            <BlockFormControlLabel
              control={<Checkbox name="ssid_hidden" checked={data.ssid_hidden} onChange={updateFormValue} />}
-              label={LL.AP_HIDE_SSID()}
+              label="Hide SSID"
            />
            <ValidatedTextField
              fieldErrors={fieldErrors}
              name="max_clients"
-              label={LL.AP_MAX_CLIENTS()}
+              label="Max Clients"
              value={numberValue(data.max_clients)}
              fullWidth
              select
@@ -134,7 +130,7 @@ const APSettingsForm: FC = () => {
            <ValidatedTextField
              fieldErrors={fieldErrors}
              name="local_ip"
-              label={LL.AP_LOCAL_IP()}
+              label="Local IP"
              fullWidth
              variant="outlined"
              value={data.local_ip}
@@ -144,7 +140,7 @@ const APSettingsForm: FC = () => {
            <ValidatedTextField
              fieldErrors={fieldErrors}
              name="gateway_ip"
-              label={LL.NETWORK_GATEWAY()}
+              label="Gateway"
              fullWidth
              variant="outlined"
              value={data.gateway_ip}
@@ -154,7 +150,7 @@ const APSettingsForm: FC = () => {
            <ValidatedTextField
              fieldErrors={fieldErrors}
              name="subnet_mask"
-              label={LL.NETWORK_SUBNET()}
+              label="Subnet"
              fullWidth
              variant="outlined"
              value={data.subnet_mask}
@@ -172,7 +168,7 @@ const APSettingsForm: FC = () => {
            type="submit"
            onClick={validateAndSubmit}
          >
-            {LL.SAVE()}
+            Save
          </Button>
        </ButtonRow>
      </>
@@ -180,7 +176,7 @@ const APSettingsForm: FC = () => {
  };

  return (
-    <SectionContent title={LL.SETTINGS_OF(LL.ACCESS_POINT(1))} titleGutter>
+    <SectionContent title="Access Point Settings" titleGutter>
      {content()}
    </SectionContent>
  );
--- a/interface/src/framework/ap/APStatusForm.tsx
+++ b/interface/src/framework/ap/APStatusForm.tsx
@@ -11,8 +11,6 @@ import { APNetworkStatus, APStatus } from '../../types';
 import { ButtonRow, FormLoader, SectionContent } from '../../components';
 import { useRest } from '../../utils';

-import { useI18nContext } from '../../i18n/i18n-react';
-
 export const apStatusHighlight = ({ status }: APStatus, theme: Theme) => {
  switch (status) {
    case APNetworkStatus.ACTIVE:
@@ -26,26 +24,24 @@ export const apStatusHighlight = ({ status }: APStatus, theme: Theme) => {
  }
 };

+export const apStatus = ({ status }: APStatus) => {
+  switch (status) {
+    case APNetworkStatus.ACTIVE:
+      return 'Active';
+    case APNetworkStatus.INACTIVE:
+      return 'Inactive';
+    case APNetworkStatus.LINGERING:
+      return 'Lingering until idle';
+    default:
+      return 'Unknown';
+  }
+};
+
 const APStatusForm: FC = () => {
  const { loadData, data, errorMessage } = useRest<APStatus>({ read: APApi.readAPStatus });

-  const { LL } = useI18nContext();
-
  const theme = useTheme();

-  const apStatus = ({ status }: APStatus) => {
-    switch (status) {
-      case APNetworkStatus.ACTIVE:
-        return LL.ACTIVE();
-      case APNetworkStatus.INACTIVE:
-        return LL.INACTIVE(0);
-      case APNetworkStatus.LINGERING:
-        return 'Lingering until idle';
-      default:
-        return LL.UNKNOWN();
-    }
-  };
-
  const content = () => {
    if (!data) {
      return <FormLoader onRetry={loadData} errorMessage={errorMessage} />;
@@ -60,14 +56,14 @@ const APStatusForm: FC = () => {
                <SettingsInputAntennaIcon />
              </Avatar>
            </ListItemAvatar>
-            <ListItemText primary={LL.STATUS_OF('')} secondary={apStatus(data)} />
+            <ListItemText primary="Status" secondary={apStatus(data)} />
          </ListItem>
          <Divider variant="inset" component="li" />
          <ListItem>
            <ListItemAvatar>
              <Avatar>IP</Avatar>
            </ListItemAvatar>
-            <ListItemText primary={LL.ADDRESS_OF('IP')} secondary={data.ip_address} />
+            <ListItemText primary="IP Address" secondary={data.ip_address} />
          </ListItem>
          <Divider variant="inset" component="li" />
          <ListItem>
@@ -76,7 +72,7 @@ const APStatusForm: FC = () => {
                <DeviceHubIcon />
              </Avatar>
            </ListItemAvatar>
-            <ListItemText primary={LL.ADDRESS_OF('MAC')} secondary={data.mac_address} />
+            <ListItemText primary="MAC Address" secondary={data.mac_address} />
          </ListItem>
          <Divider variant="inset" component="li" />
          <ListItem>
@@ -85,13 +81,13 @@ const APStatusForm: FC = () => {
                <ComputerIcon />
              </Avatar>
            </ListItemAvatar>
-            <ListItemText primary={LL.AP_CLIENTS()} secondary={data.station_num} />
+            <ListItemText primary="AP Clients" secondary={data.station_num} />
          </ListItem>
          <Divider variant="inset" component="li" />
        </List>
        <ButtonRow>
          <Button startIcon={<RefreshIcon />} variant="outlined" color="secondary" onClick={loadData}>
-            {LL.REFRESH()}
+            Refresh
          </Button>
        </ButtonRow>
      </>
@@ -99,7 +95,7 @@ const APStatusForm: FC = () => {
  };

  return (
-    <SectionContent title={LL.STATUS_OF(LL.ACCESS_POINT(1))} titleGutter>
+    <SectionContent title="Access Point Status" titleGutter>
      {content()}
    </SectionContent>
  );
--- a/interface/src/framework/ap/AccessPoint.tsx
+++ b/interface/src/framework/ap/AccessPoint.tsx
@@ -8,12 +8,8 @@ import APStatusForm from './APStatusForm';
 import APSettingsForm from './APSettingsForm';
 import { RequireAdmin, RouterTabs, useLayoutTitle, useRouterTab } from '../../components';

-import { useI18nContext } from '../../i18n/i18n-react';
-
 const AccessPoint: FC = () => {
-  const { LL } = useI18nContext();
-
-  useLayoutTitle(LL.ACCESS_POINT(0));
+  useLayoutTitle('Access Point');

  const authenticatedContext = useContext(AuthenticatedContext);

@@ -22,8 +18,8 @@ const AccessPoint: FC = () => {
  return (
    <>
      <RouterTabs value={routerTab}>
-        <Tab value="status" label={LL.STATUS_OF(LL.ACCESS_POINT(1))} />
-        <Tab value="settings" label={LL.SETTINGS_OF(LL.ACCESS_POINT(1))} disabled={!authenticatedContext.me.admin} />
+        <Tab value="status" label="Access Point Status" />
+        <Tab value="settings" label="Access Point Settings" disabled={!authenticatedContext.me.admin} />
      </RouterTabs>
      <Routes>
        <Route path="status" element={<APStatusForm />} />
--- a/interface/src/framework/mqtt/Mqtt.tsx
+++ b/interface/src/framework/mqtt/Mqtt.tsx
@@ -9,11 +9,7 @@ import { AuthenticatedContext } from '../../contexts/authentication';
 import MqttStatusForm from './MqttStatusForm';
 import MqttSettingsForm from './MqttSettingsForm';

-import { useI18nContext } from '../../i18n/i18n-react';
-
 const Mqtt: FC = () => {
-  const { LL } = useI18nContext();
-
  useLayoutTitle('MQTT');

  const authenticatedContext = useContext(AuthenticatedContext);
@@ -22,8 +18,8 @@ const Mqtt: FC = () => {
  return (
    <>
      <RouterTabs value={routerTab}>
-        <Tab value="status" label={LL.STATUS_OF('MQTT')} />
-        <Tab value="settings" label={LL.SETTINGS_OF('MQTT')} disabled={!authenticatedContext.me.admin} />
+        <Tab value="status" label="MQTT Status" />
+        <Tab value="settings" label="MQTT Settings" disabled={!authenticatedContext.me.admin} />
      </RouterTabs>
      <Routes>
        <Route path="status" element={<MqttStatusForm />} />
--- a/interface/src/framework/mqtt/MqttSettingsForm.tsx
+++ b/interface/src/framework/mqtt/MqttSettingsForm.tsx
@@ -1,10 +1,10 @@
 import { FC, useState } from 'react';
 import { ValidateFieldsError } from 'async-validator';

-import { Button, Checkbox, MenuItem, Grid, Typography, InputAdornment } from '@mui/material';
+import { Button, Checkbox, MenuItem, Grid, Typography } from '@mui/material';
 import SaveIcon from '@mui/icons-material/Save';

-import { createMqttSettingsValidator, validate } from '../../validators';
+import { MQTT_SETTINGS_VALIDATOR, validate } from '../../validators';
 import {
  BlockFormControlLabel,
  ButtonRow,
@@ -17,16 +17,12 @@ import { MqttSettings } from '../../types';
 import { numberValue, updateValue, useRest } from '../../utils';
 import * as MqttApi from '../../api/mqtt';

-import { useI18nContext } from '../../i18n/i18n-react';
-
 const MqttSettingsForm: FC = () => {
  const { loadData, saving, data, setData, saveData, errorMessage } = useRest<MqttSettings>({
    read: MqttApi.readMqttSettings,
    update: MqttApi.updateMqttSettings
  });

-  const { LL } = useI18nContext();
-
  const [fieldErrors, setFieldErrors] = useState<ValidateFieldsError>();

  const updateFormValue = updateValue(setData);
@@ -39,7 +35,7 @@ const MqttSettingsForm: FC = () => {
    const validateAndSubmit = async () => {
      try {
        setFieldErrors(undefined);
-        await validate(createMqttSettingsValidator(data), data);
+        await validate(MQTT_SETTINGS_VALIDATOR, data);
        saveData();
      } catch (errors: any) {
        setFieldErrors(errors);
@@ -50,14 +46,14 @@ const MqttSettingsForm: FC = () => {
      <>
        <BlockFormControlLabel
          control={<Checkbox name="enabled" checked={data.enabled} onChange={updateFormValue} />}
-          label={LL.ENABLE_MQTT()}
+          label="Enable MQTT"
        />
        <Grid container spacing={1} direction="row" justifyContent="flex-start" alignItems="flex-start">
          <Grid item xs={6}>
            <ValidatedTextField
              fieldErrors={fieldErrors}
              name="host"
-              label={LL.ADDRESS_OF(LL.BROKER())}
+              label="Host"
              fullWidth
              variant="outlined"
              value={data.host}
@@ -84,7 +80,7 @@ const MqttSettingsForm: FC = () => {
            <ValidatedTextField
              fieldErrors={fieldErrors}
              name="base"
-              label={LL.BASE_TOPIC()}
+              label="Bsse"
              fullWidth
              variant="outlined"
              value={data.base}
@@ -95,7 +91,7 @@ const MqttSettingsForm: FC = () => {
          <Grid item xs={6}>
            <ValidatedTextField
              name="client_id"
-              label={LL.ID_OF(LL.CLIENT()) + ' (' + LL.OPTIONAL() + ')'}
+              label="Client ID (optional)"
              fullWidth
              variant="outlined"
              value={data.client_id}
@@ -108,7 +104,7 @@ const MqttSettingsForm: FC = () => {
          <Grid item xs={6}>
            <ValidatedTextField
              name="username"
-              label={LL.USERNAME(0)}
+              label="Username"
              fullWidth
              variant="outlined"
              value={data.username}
@@ -119,7 +115,7 @@ const MqttSettingsForm: FC = () => {
          <Grid item xs={6}>
            <ValidatedPasswordField
              name="password"
-              label={LL.PASSWORD()}
+              label="Password"
              fullWidth
              variant="outlined"
              value={data.password}
@@ -133,10 +129,7 @@ const MqttSettingsForm: FC = () => {
            <ValidatedTextField
              fieldErrors={fieldErrors}
              name="keep_alive"
-              label="Keep Alive"
-              InputProps={{
-                endAdornment: <InputAdornment position="end">{LL.SECONDS()}</InputAdornment>
-              }}
+              label="Keep Alive (seconds)"
              fullWidth
              variant="outlined"
              value={numberValue(data.keep_alive)}
@@ -156,7 +149,7 @@ const MqttSettingsForm: FC = () => {
              margin="normal"
              select
            >
-              <MenuItem value={0}>0</MenuItem>
+              <MenuItem value={0}>0 (default)</MenuItem>
              <MenuItem value={1}>1</MenuItem>
              <MenuItem value={2}>2</MenuItem>
            </ValidatedTextField>
@@ -164,19 +157,18 @@ const MqttSettingsForm: FC = () => {
        </Grid>
        <BlockFormControlLabel
          control={<Checkbox name="clean_session" checked={data.clean_session} onChange={updateFormValue} />}
-          label={LL.MQTT_CLEAN_SESSION()}
+          label="Set Clean Session"
        />
        <BlockFormControlLabel
          control={<Checkbox name="mqtt_retain" checked={data.mqtt_retain} onChange={updateFormValue} />}
-          label={LL.MQTT_RETAIN_FLAG()}
+          label="Always use Retain Flag"
        />
-
        <Typography sx={{ pt: 2 }} variant="h6" color="primary">
-          {LL.FORMATTING()}
+          Formatting
        </Typography>
        <ValidatedTextField
          name="nested_format"
-          label={LL.MQTT_FORMAT()}
+          label="Topic/Payload Format"
          value={data.nested_format}
          fullWidth
          variant="outlined"
@@ -184,19 +176,19 @@ const MqttSettingsForm: FC = () => {
          margin="normal"
          select
        >
-          <MenuItem value={1}>{LL.MQTT_NEST_1()}</MenuItem>
-          <MenuItem value={2}>{LL.MQTT_NEST_2()}</MenuItem>
+          <MenuItem value={1}>Nested in a single topic</MenuItem>
+          <MenuItem value={2}>As individual topics</MenuItem>
        </ValidatedTextField>
        <BlockFormControlLabel
          control={<Checkbox name="send_response" checked={data.send_response} onChange={updateFormValue} />}
-          label={LL.MQTT_RESPONSE()}
+          label="Publish command output to a 'response' topic"
        />
        {!data.ha_enabled && (
          <Grid container spacing={1} direction="row" justifyContent="flex-start" alignItems="flex-start">
            <Grid item>
              <BlockFormControlLabel
                control={<Checkbox name="publish_single" checked={data.publish_single} onChange={updateFormValue} />}
-                label={LL.MQTT_PUBLISH_TEXT_1()}
+                label="Publish single value topics on change"
              />
            </Grid>
            {data.publish_single && (
@@ -205,7 +197,7 @@ const MqttSettingsForm: FC = () => {
                  control={
                    <Checkbox name="publish_single2cmd" checked={data.publish_single2cmd} onChange={updateFormValue} />
                  }
-                  label={LL.MQTT_PUBLISH_TEXT_2()}
+                  label="Publish to command topics (ioBroker)"
                />
              </Grid>
            )}
@@ -215,74 +207,34 @@ const MqttSettingsForm: FC = () => {
          <Grid container spacing={1} direction="row" justifyContent="flex-start" alignItems="flex-start">
            <Grid item>
              <BlockFormControlLabel
-                sx={{ pb: 1 }}
                control={<Checkbox name="ha_enabled" checked={data.ha_enabled} onChange={updateFormValue} />}
-                label={LL.MQTT_PUBLISH_TEXT_3()}
+                label="Enable MQTT Discovery (Home Assistant, Domoticz)"
              />
            </Grid>
            {data.ha_enabled && (
-              <>
-                <Grid container spacing={1} direction="row" justifyContent="flex-start" alignItems="flex-start">
-                  <Grid item>
-                    <ValidatedTextField
-                      name="discovery_prefix"
-                      label={LL.MQTT_PUBLISH_TEXT_4()}
-                      fullWidth
-                      variant="outlined"
-                      value={data.discovery_prefix}
-                      onChange={updateFormValue}
-                      margin="normal"
-                    />
-                  </Grid>
-                  <Grid item>
-                    <ValidatedTextField
-                      name="entity_format"
-                      label={LL.MQTT_ENTITY_FORMAT()}
-                      value={data.entity_format}
-                      fullWidth
-                      variant="outlined"
-                      onChange={updateFormValue}
-                      margin="normal"
-                      select
-                    >
-                      <MenuItem value={0}>{LL.MQTT_ENTITY_FORMAT_0()}</MenuItem>
-                      <MenuItem value={1}>{LL.MQTT_ENTITY_FORMAT_1()}</MenuItem>
-                      <MenuItem value={2}>{LL.MQTT_ENTITY_FORMAT_2()}</MenuItem>
-                    </ValidatedTextField>
-                  </Grid>
-                </Grid>
-              </>
+              <Grid item xs={6}>
+                <ValidatedTextField
+                  name="discovery_prefix"
+                  label="Prefix for the Discovery topics"
+                  fullWidth
+                  variant="outlined"
+                  value={data.discovery_prefix}
+                  onChange={updateFormValue}
+                  margin="normal"
+                />
+              </Grid>
            )}
          </Grid>
        )}
        <Typography sx={{ pt: 2 }} variant="h6" color="primary">
-          {LL.MQTT_PUBLISH_INTERVALS()}&nbsp;(0=auto)
+          Publish Intervals (in seconds, 0=automatic)
        </Typography>
        <Grid container spacing={1} direction="row" justifyContent="flex-start" alignItems="flex-start">
-          <Grid item xs={6} sm={4}>
-            <ValidatedTextField
-              fieldErrors={fieldErrors}
-              name="publish_time_heartbeat"
-              label={LL.MQTT_INT_HEARTBEAT()}
-              InputProps={{
-                endAdornment: <InputAdornment position="end">{LL.SECONDS()}</InputAdornment>
-              }}
-              fullWidth
-              variant="outlined"
-              value={numberValue(data.publish_time_heartbeat)}
-              type="number"
-              onChange={updateFormValue}
-              margin="normal"
-            />
-          </Grid>
-          <Grid item xs={6} sm={4}>
+          <Grid item xs={4}>
            <ValidatedTextField
              fieldErrors={fieldErrors}
              name="publish_time_boiler"
-              label={LL.MQTT_INT_BOILER()}
-              InputProps={{
-                endAdornment: <InputAdornment position="end">{LL.SECONDS()}</InputAdornment>
-              }}
+              label="Boilers and Heat Pumps"
              fullWidth
              variant="outlined"
              value={numberValue(data.publish_time_boiler)}
@@ -291,14 +243,11 @@ const MqttSettingsForm: FC = () => {
              margin="normal"
            />
          </Grid>
-          <Grid item xs={6} sm={4}>
+          <Grid item xs={4}>
            <ValidatedTextField
              fieldErrors={fieldErrors}
              name="publish_time_thermostat"
-              label={LL.MQTT_INT_THERMOSTATS()}
-              InputProps={{
-                endAdornment: <InputAdornment position="end">{LL.SECONDS()}</InputAdornment>
-              }}
+              label="Thermostats"
              fullWidth
              variant="outlined"
              value={numberValue(data.publish_time_thermostat)}
@@ -307,14 +256,11 @@ const MqttSettingsForm: FC = () => {
              margin="normal"
            />
          </Grid>
-          <Grid item xs={6} sm={4}>
+          <Grid item xs={4}>
            <ValidatedTextField
              fieldErrors={fieldErrors}
              name="publish_time_solar"
-              label={LL.MQTT_INT_SOLAR()}
-              InputProps={{
-                endAdornment: <InputAdornment position="end">{LL.SECONDS()}</InputAdornment>
-              }}
+              label="Solar Modules"
              fullWidth
              variant="outlined"
              value={numberValue(data.publish_time_solar)}
@@ -323,14 +269,11 @@ const MqttSettingsForm: FC = () => {
              margin="normal"
            />
          </Grid>
-          <Grid item xs={6} sm={4}>
+          <Grid item xs={4}>
            <ValidatedTextField
              fieldErrors={fieldErrors}
              name="publish_time_mixer"
-              label={LL.MQTT_INT_MIXER()}
-              InputProps={{
-                endAdornment: <InputAdornment position="end">{LL.SECONDS()}</InputAdornment>
-              }}
+              label="Mixer Modules"
              fullWidth
              variant="outlined"
              value={numberValue(data.publish_time_mixer)}
@@ -339,14 +282,11 @@ const MqttSettingsForm: FC = () => {
              margin="normal"
            />
          </Grid>
-          <Grid item xs={6} sm={4}>
+          <Grid item xs={4}>
            <ValidatedTextField
              fieldErrors={fieldErrors}
              name="publish_time_sensor"
-              label={LL.TEMP_SENSORS()}
-              InputProps={{
-                endAdornment: <InputAdornment position="end">{LL.SECONDS()}</InputAdornment>
-              }}
+              label="Temperature Sensors"
              fullWidth
              variant="outlined"
              value={numberValue(data.publish_time_sensor)}
@@ -355,14 +295,11 @@ const MqttSettingsForm: FC = () => {
              margin="normal"
            />
          </Grid>
-          <Grid item xs={6} sm={4}>
+          <Grid item xs={4}>
            <ValidatedTextField
              fieldErrors={fieldErrors}
              name="publish_time_other"
-              InputProps={{
-                endAdornment: <InputAdornment position="end">{LL.SECONDS()}</InputAdornment>
-              }}
-              label={LL.DEFAULT(0)}
+              label="Default"
              fullWidth
              variant="outlined"
              value={numberValue(data.publish_time_other)}
@@ -381,7 +318,7 @@ const MqttSettingsForm: FC = () => {
            type="submit"
            onClick={validateAndSubmit}
          >
-            {LL.SAVE()}
+            Save
          </Button>
        </ButtonRow>
      </>
@@ -389,7 +326,7 @@ const MqttSettingsForm: FC = () => {
  };

  return (
-    <SectionContent title={LL.SETTINGS_OF('MQTT')} titleGutter>
+    <SectionContent title="MQTT Settings" titleGutter>
      {content()}
    </SectionContent>
  );
--- a/interface/src/framework/mqtt/MqttStatusForm.tsx
+++ b/interface/src/framework/mqtt/MqttStatusForm.tsx
@@ -5,15 +5,12 @@ import DeviceHubIcon from '@mui/icons-material/DeviceHub';
 import RefreshIcon from '@mui/icons-material/Refresh';
 import ReportIcon from '@mui/icons-material/Report';
 import SpeakerNotesOffIcon from '@mui/icons-material/SpeakerNotesOff';
-import AutoAwesomeMotionIcon from '@mui/icons-material/AutoAwesomeMotion';

 import { ButtonRow, FormLoader, SectionContent } from '../../components';
 import { MqttStatus, MqttDisconnectReason } from '../../types';
 import * as MqttApi from '../../api/mqtt';
 import { useRest } from '../../utils';

-import { useI18nContext } from '../../i18n/i18n-react';
-
 export const mqttStatusHighlight = ({ enabled, connected }: MqttStatus, theme: Theme) => {
  if (!enabled) {
    return theme.palette.info.main;
@@ -32,96 +29,80 @@ export const mqttPublishHighlight = ({ mqtt_fails }: MqttStatus, theme: Theme) =
  return theme.palette.error.main;
 };

-export const mqttQueueHighlight = ({ mqtt_queued }: MqttStatus, theme: Theme) => {
-  if (mqtt_queued <= 1) return theme.palette.success.main;
+export const mqttStatus = ({ enabled, connected }: MqttStatus) => {
+  if (!enabled) {
+    return 'Not enabled';
+  }
+  if (connected) {
+    return 'Connected';
+  }
+  return 'Disconnected';
+};

-  return theme.palette.warning.main;
+export const disconnectReason = ({ disconnect_reason }: MqttStatus) => {
+  switch (disconnect_reason) {
+    case MqttDisconnectReason.TCP_DISCONNECTED:
+      return 'TCP disconnected';
+    case MqttDisconnectReason.MQTT_UNACCEPTABLE_PROTOCOL_VERSION:
+      return 'Unacceptable protocol version';
+    case MqttDisconnectReason.MQTT_IDENTIFIER_REJECTED:
+      return 'Client ID rejected';
+    case MqttDisconnectReason.MQTT_SERVER_UNAVAILABLE:
+      return 'Server unavailable';
+    case MqttDisconnectReason.MQTT_MALFORMED_CREDENTIALS:
+      return 'Malformed credentials';
+    case MqttDisconnectReason.MQTT_NOT_AUTHORIZED:
+      return 'Not authorized';
+    case MqttDisconnectReason.ESP8266_NOT_ENOUGH_SPACE:
+      return 'Device out of memory';
+    case MqttDisconnectReason.TLS_BAD_FINGERPRINT:
+      return 'Server fingerprint invalid';
+    default:
+      return 'Unknown';
+  }
 };

 const MqttStatusForm: FC = () => {
  const { loadData, data, errorMessage } = useRest<MqttStatus>({ read: MqttApi.readMqttStatus });

-  const { LL } = useI18nContext();
-
  const theme = useTheme();

-  const mqttStatus = ({ enabled, connected, connect_count }: MqttStatus) => {
-    if (!enabled) {
-      return LL.NOT_ENABLED();
-    }
-    if (connected) {
-      return LL.CONNECTED(0) + (connect_count > 1 ? ' (' + connect_count + ')' : '');
-    }
-    return LL.DISCONNECTED() + (connect_count > 1 ? ' (' + connect_count + ')' : '');
-  };
-
-  const disconnectReason = ({ disconnect_reason }: MqttStatus) => {
-    switch (disconnect_reason) {
-      case MqttDisconnectReason.TCP_DISCONNECTED:
-        return 'TCP disconnected';
-      case MqttDisconnectReason.MQTT_UNACCEPTABLE_PROTOCOL_VERSION:
-        return 'Unacceptable protocol version';
-      case MqttDisconnectReason.MQTT_IDENTIFIER_REJECTED:
-        return 'Client ID rejected';
-      case MqttDisconnectReason.MQTT_SERVER_UNAVAILABLE:
-        return 'Server unavailable';
-      case MqttDisconnectReason.MQTT_MALFORMED_CREDENTIALS:
-        return 'Malformed credentials';
-      case MqttDisconnectReason.MQTT_NOT_AUTHORIZED:
-        return 'Not authorized';
-      case MqttDisconnectReason.ESP8266_NOT_ENOUGH_SPACE:
-        return 'Device out of memory';
-      case MqttDisconnectReason.TLS_BAD_FINGERPRINT:
-        return 'Server fingerprint invalid';
-      default:
-        return 'Unknown';
-    }
-  };
-
  const content = () => {
    if (!data) {
      return <FormLoader onRetry={loadData} errorMessage={errorMessage} />;
    }

    const renderConnectionStatus = () => {
+      if (data.connected) {
+        return (
+          <>
+            <ListItem>
+              <ListItemAvatar>
+                <Avatar>#</Avatar>
+              </ListItemAvatar>
+              <ListItemText primary="Client ID" secondary={data.client_id} />
+            </ListItem>
+            <Divider variant="inset" component="li" />
+            <ListItem>
+              <ListItemAvatar>
+                <Avatar sx={{ bgcolor: mqttPublishHighlight(data, theme) }}>
+                  <SpeakerNotesOffIcon />
+                </Avatar>
+              </ListItemAvatar>
+              <ListItemText primary="MQTT Publish Errors" secondary={data.mqtt_fails} />
+            </ListItem>
+          </>
+        );
+      }
      return (
        <>
-          {!data.connected && (
-            <>
-              <ListItem>
-                <ListItemAvatar>
-                  <Avatar>
-                    <ReportIcon />
-                  </Avatar>
-                </ListItemAvatar>
-                <ListItemText primary={LL.DISCONNECT_REASON()} secondary={disconnectReason(data)} />
-              </ListItem>
-              <Divider variant="inset" component="li" />
-            </>
-          )}
          <ListItem>
            <ListItemAvatar>
-              <Avatar>#</Avatar>
-            </ListItemAvatar>
-            <ListItemText primary={LL.ID_OF(LL.CLIENT())} secondary={data.client_id} />
-          </ListItem>
-          <Divider variant="inset" component="li" />
-          <ListItem>
-            <ListItemAvatar>
-              <Avatar sx={{ bgcolor: mqttQueueHighlight(data, theme) }}>
-                <AutoAwesomeMotionIcon />
+              <Avatar>
+                <ReportIcon />
              </Avatar>
            </ListItemAvatar>
-            <ListItemText primary={LL.MQTT_QUEUE()} secondary={data.mqtt_queued} />
-          </ListItem>
-          <Divider variant="inset" component="li" />
-          <ListItem>
-            <ListItemAvatar>
-              <Avatar sx={{ bgcolor: mqttPublishHighlight(data, theme) }}>
-                <SpeakerNotesOffIcon />
-              </Avatar>
-            </ListItemAvatar>
-            <ListItemText primary={LL.ERRORS_OF('MQTT')} secondary={data.mqtt_fails} />
+            <ListItemText primary="Disconnect Reason" secondary={disconnectReason(data)} />
          </ListItem>
          <Divider variant="inset" component="li" />
        </>
@@ -137,14 +118,14 @@ const MqttStatusForm: FC = () => {
                <DeviceHubIcon />
              </Avatar>
            </ListItemAvatar>
-            <ListItemText primary={LL.STATUS_OF('')} secondary={mqttStatus(data)} />
+            <ListItemText primary="Status" secondary={mqttStatus(data)} />
          </ListItem>
          <Divider variant="inset" component="li" />
          {data.enabled && renderConnectionStatus()}
        </List>
        <ButtonRow>
          <Button startIcon={<RefreshIcon />} variant="outlined" color="secondary" onClick={loadData}>
-            {LL.REFRESH()}
+            Refresh
          </Button>
        </ButtonRow>
      </>
@@ -152,7 +133,7 @@ const MqttStatusForm: FC = () => {
  };

  return (
-    <SectionContent title={LL.STATUS_OF('MQTT')} titleGutter>
+    <SectionContent title="MQTT Status" titleGutter>
      {content()}
    </SectionContent>
  );
--- a/interface/src/framework/network/NetworkConnection.tsx
+++ b/interface/src/framework/network/NetworkConnection.tsx
@@ -11,16 +11,12 @@ import NetworkStatusForm from './NetworkStatusForm';
 import WiFiNetworkScanner from './WiFiNetworkScanner';
 import NetworkSettingsForm from './NetworkSettingsForm';

-import { useI18nContext } from '../../i18n/i18n-react';
-
 const NetworkConnection: FC = () => {
-  const { LL } = useI18nContext();
-  useLayoutTitle(LL.NETWORK(0));
-
-  const { routerTab } = useRouterTab();
+  useLayoutTitle('Network Connection');

  const authenticatedContext = useContext(AuthenticatedContext);
  const navigate = useNavigate();
+  const { routerTab } = useRouterTab();

  const [selectedNetwork, setSelectedNetwork] = useState<WiFiNetwork>();

@@ -45,9 +41,9 @@ const NetworkConnection: FC = () => {
      }}
    >
      <RouterTabs value={routerTab}>
-        <Tab value="status" label={LL.STATUS_OF(LL.NETWORK(1))} />
-        <Tab value="scan" label={LL.NETWORK_SCAN()} disabled={!authenticatedContext.me.admin} />
-        <Tab value="settings" label={LL.SETTINGS_OF(LL.NETWORK(1))} disabled={!authenticatedContext.me.admin} />
+        <Tab value="status" label="Network Status" />
+        <Tab value="scan" label="Scan WiFi Networks" disabled={!authenticatedContext.me.admin} />
+        <Tab value="settings" label="Network Settings" disabled={!authenticatedContext.me.admin} />
      </RouterTabs>
      <Routes>
        <Route path="status" element={<NetworkStatusForm />} />
--- a/interface/src/framework/network/NetworkSettingsForm.tsx
+++ b/interface/src/framework/network/NetworkSettingsForm.tsx
@@ -1,5 +1,4 @@
 import { FC, useContext, useEffect, useState } from 'react';
-import { useSnackbar } from 'notistack';

 import {
  Avatar,
@@ -11,15 +10,13 @@ import {
  ListItemAvatar,
  ListItemSecondaryAction,
  ListItemText,
-  Typography,
-  InputAdornment
+  Typography
 } from '@mui/material';

 import LockOpenIcon from '@mui/icons-material/LockOpen';
 import DeleteIcon from '@mui/icons-material/Delete';
 import SaveIcon from '@mui/icons-material/Save';
 import LockIcon from '@mui/icons-material/Lock';
-import PowerSettingsNewIcon from '@mui/icons-material/PowerSettingsNew';

 import {
  BlockFormControlLabel,
@@ -27,13 +24,11 @@ import {
  FormLoader,
  SectionContent,
  ValidatedPasswordField,
-  ValidatedTextField,
-  MessageBox
+  ValidatedTextField
 } from '../../components';
 import { NetworkSettings } from '../../types';
 import * as NetworkApi from '../../api/network';
 import { numberValue, updateValue, useRest } from '../../utils';
-import * as EMSESP from '../../project/api';

 import { WiFiConnectionContext } from './WiFiConnectionContext';
 import { isNetworkOpen, networkSecurityMode } from './WiFiNetworkSelector';
@@ -41,18 +36,11 @@ import { ValidateFieldsError } from 'async-validator';
 import { validate } from '../../validators';
 import { createNetworkSettingsValidator } from '../../validators/network';

-import { useI18nContext } from '../../i18n/i18n-react';
-import RestartMonitor from '../system/RestartMonitor';
-
 const WiFiSettingsForm: FC = () => {
-  const { LL } = useI18nContext();
-  const { enqueueSnackbar } = useSnackbar();
-
  const { selectedNetwork, deselectNetwork } = useContext(WiFiConnectionContext);

  const [initialized, setInitialized] = useState(false);
-  const [restarting, setRestarting] = useState(false);
-  const { loadData, saving, data, setData, saveData, errorMessage, restartNeeded } = useRest<NetworkSettings>({
+  const { loadData, saving, data, setData, saveData, errorMessage } = useRest<NetworkSettings>({
    read: NetworkApi.readNetworkSettings,
    update: NetworkApi.updateNetworkSettings
  });
@@ -69,9 +57,7 @@ const WiFiSettingsForm: FC = () => {
          bandwidth20: false,
          tx_power: 20,
          nosleep: false,
-          enableMDNS: true,
-          enableCORS: false,
-          CORSOrigin: '*'
+          enableMDNS: true
        });
      }
      setInitialized(true);
@@ -99,15 +85,6 @@ const WiFiSettingsForm: FC = () => {
      }
    };

-    const restart = async () => {
-      try {
-        await EMSESP.restart();
-        setRestarting(true);
-      } catch (error) {
-        enqueueSnackbar(LL.PROBLEM_UPDATING(), { variant: 'error' });
-      }
-    };
-
    return (
      <>
        <Typography sx={{ pt: 2 }} variant="h6" color="primary">
@@ -134,7 +111,7 @@ const WiFiSettingsForm: FC = () => {
          <ValidatedTextField
            fieldErrors={fieldErrors}
            name="ssid"
-            label={'SSID (' + LL.NETWORK_BLANK_SSID() + ')'}
+            label="SSID (leave blank to disable WiFi)"
            fullWidth
            variant="outlined"
            value={data.ssid}
@@ -146,7 +123,7 @@ const WiFiSettingsForm: FC = () => {
          <ValidatedPasswordField
            fieldErrors={fieldErrors}
            name="password"
-            label={LL.PASSWORD()}
+            label="Password"
            fullWidth
            variant="outlined"
            value={data.password}
@@ -158,10 +135,7 @@ const WiFiSettingsForm: FC = () => {
        <ValidatedTextField
          fieldErrors={fieldErrors}
          name="tx_power"
-          label={LL.TX_POWER()}
-          InputProps={{
-            endAdornment: <InputAdornment position="end">dBm</InputAdornment>
-          }}
+          label="WiFi Tx Power (dBm)"
          fullWidth
          variant="outlined"
          value={numberValue(data.tx_power)}
@@ -172,22 +146,27 @@ const WiFiSettingsForm: FC = () => {

        <BlockFormControlLabel
          control={<Checkbox name="nosleep" checked={data.nosleep} onChange={updateFormValue} />}
-          label={LL.NETWORK_DISABLE_SLEEP()}
+          label="Disable WiFi Sleep Mode"
        />

        <BlockFormControlLabel
          control={<Checkbox name="bandwidth20" checked={data.bandwidth20} onChange={updateFormValue} />}
-          label={LL.NETWORK_LOW_BAND()}
+          label="Use Lower WiFi Bandwidth"
+        />
+
+        <BlockFormControlLabel
+          control={<Checkbox name="enableMDNS" checked={data.enableMDNS} onChange={updateFormValue} />}
+          label="Enable mDNS Service"
        />

        <Typography sx={{ pt: 2 }} variant="h6" color="primary">
-          {LL.GENERAL_OPTIONS()}
+          General
        </Typography>

        <ValidatedTextField
          fieldErrors={fieldErrors}
          name="hostname"
-          label={LL.HOSTNAME()}
+          label="Hostname"
          fullWidth
          variant="outlined"
          value={data.hostname}
@@ -195,43 +174,21 @@ const WiFiSettingsForm: FC = () => {
          margin="normal"
        />

-        <BlockFormControlLabel
-          control={<Checkbox name="enableMDNS" checked={data.enableMDNS} onChange={updateFormValue} />}
-          label={LL.NETWORK_USE_DNS()}
-        />
-
-        <BlockFormControlLabel
-          control={<Checkbox name="enableCORS" checked={data.enableCORS} onChange={updateFormValue} />}
-          label={LL.NETWORK_ENABLE_CORS()}
-        />
-        {data.enableCORS && (
-          <ValidatedTextField
-            fieldErrors={fieldErrors}
-            name="CORSOrigin"
-            label={LL.NETWORK_CORS_ORIGIN()}
-            fullWidth
-            variant="outlined"
-            value={data.CORSOrigin}
-            onChange={updateFormValue}
-            margin="normal"
-          />
-        )}
-
        <BlockFormControlLabel
          control={<Checkbox name="enableIPv6" checked={data.enableIPv6} onChange={updateFormValue} />}
-          label={LL.NETWORK_ENABLE_IPV6()}
+          label="Enable IPv6 support"
        />

        <BlockFormControlLabel
          control={<Checkbox name="static_ip_config" checked={data.static_ip_config} onChange={updateFormValue} />}
-          label={LL.NETWORK_FIXED_IP()}
+          label="Use Fixed IP address"
        />
        {data.static_ip_config && (
          <>
            <ValidatedTextField
              fieldErrors={fieldErrors}
              name="local_ip"
-              label={LL.AP_LOCAL_IP()}
+              label="Local IP"
              fullWidth
              variant="outlined"
              value={data.local_ip}
@@ -241,7 +198,7 @@ const WiFiSettingsForm: FC = () => {
            <ValidatedTextField
              fieldErrors={fieldErrors}
              name="gateway_ip"
-              label={LL.NETWORK_GATEWAY()}
+              label="Gateway"
              fullWidth
              variant="outlined"
              value={data.gateway_ip}
@@ -251,7 +208,7 @@ const WiFiSettingsForm: FC = () => {
            <ValidatedTextField
              fieldErrors={fieldErrors}
              name="subnet_mask"
-              label={LL.NETWORK_SUBNET()}
+              label="Subnet"
              fullWidth
              variant="outlined"
              value={data.subnet_mask}
@@ -261,7 +218,7 @@ const WiFiSettingsForm: FC = () => {
            <ValidatedTextField
              fieldErrors={fieldErrors}
              name="dns_ip_1"
-              label="DNS #1"
+              label="DNS IP #1"
              fullWidth
              variant="outlined"
              value={data.dns_ip_1}
@@ -271,7 +228,7 @@ const WiFiSettingsForm: FC = () => {
            <ValidatedTextField
              fieldErrors={fieldErrors}
              name="dns_ip_2"
-              label="DNS #2"
+              label="DNS IP #2"
              fullWidth
              variant="outlined"
              value={data.dns_ip_2}
@@ -280,34 +237,25 @@ const WiFiSettingsForm: FC = () => {
            />
          </>
        )}
-        {restartNeeded && (
-          <MessageBox my={2} level="warning" message={LL.RESTART_TEXT()}>
-            <Button startIcon={<PowerSettingsNewIcon />} variant="contained" color="error" onClick={restart}>
-              {LL.RESTART()}
-            </Button>
-          </MessageBox>
-        )}
-        {!restartNeeded && (
-          <ButtonRow>
-            <Button
-              startIcon={<SaveIcon />}
-              disabled={saving}
-              variant="outlined"
-              color="primary"
-              type="submit"
-              onClick={validateAndSubmit}
-            >
-              {LL.SAVE()}
-            </Button>
-          </ButtonRow>
-        )}
+        <ButtonRow>
+          <Button
+            startIcon={<SaveIcon />}
+            disabled={saving}
+            variant="outlined"
+            color="primary"
+            type="submit"
+            onClick={validateAndSubmit}
+          >
+            Save
+          </Button>
+        </ButtonRow>
      </>
    );
  };

  return (
-    <SectionContent title={LL.SETTINGS_OF(LL.NETWORK(1))} titleGutter>
-      {restarting ? <RestartMonitor /> : content()}
+    <SectionContent title="Network Settings" titleGutter>
+      {content()}
    </SectionContent>
  );
 };
--- a/interface/src/framework/network/NetworkStatusForm.tsx
+++ b/interface/src/framework/network/NetworkStatusForm.tsx
@@ -14,8 +14,6 @@ import { NetworkConnectionStatus, NetworkStatus } from '../../types';
 import * as NetworkApi from '../../api/network';
 import { useRest } from '../../utils';

-import { useI18nContext } from '../../i18n/i18n-react';
-
 const isConnected = ({ status }: NetworkStatus) =>
  status === NetworkConnectionStatus.WIFI_STATUS_CONNECTED ||
  status === NetworkConnectionStatus.ETHERNET_STATUS_CONNECTED;
@@ -37,6 +35,29 @@ const networkStatusHighlight = ({ status }: NetworkStatus, theme: Theme) => {
  }
 };

+const networkStatus = ({ status }: NetworkStatus) => {
+  switch (status) {
+    case NetworkConnectionStatus.WIFI_STATUS_NO_SHIELD:
+      return 'Inactive';
+    case NetworkConnectionStatus.WIFI_STATUS_IDLE:
+      return 'Idle';
+    case NetworkConnectionStatus.WIFI_STATUS_NO_SSID_AVAIL:
+      return 'No SSID Available';
+    case NetworkConnectionStatus.WIFI_STATUS_CONNECTED:
+      return 'Connected (WiFi)';
+    case NetworkConnectionStatus.ETHERNET_STATUS_CONNECTED:
+      return 'Connected (Ethernet)';
+    case NetworkConnectionStatus.WIFI_STATUS_CONNECT_FAILED:
+      return 'Connection Failed';
+    case NetworkConnectionStatus.WIFI_STATUS_CONNECTION_LOST:
+      return 'Connection Lost';
+    case NetworkConnectionStatus.WIFI_STATUS_DISCONNECTED:
+      return 'Disconnected';
+    default:
+      return 'Unknown';
+  }
+};
+
 export const isWiFi = ({ status }: NetworkStatus) => status === NetworkConnectionStatus.WIFI_STATUS_CONNECTED;
 export const isEthernet = ({ status }: NetworkStatus) => status === NetworkConnectionStatus.ETHERNET_STATUS_CONNECTED;

@@ -44,7 +65,7 @@ const dnsServers = ({ dns_ip_1, dns_ip_2 }: NetworkStatus) => {
  if (!dns_ip_1) {
    return 'none';
  }
-  return dns_ip_1 + (!dns_ip_2 || dns_ip_2 === '0.0.0.0' ? '' : ',' + dns_ip_2);
+  return dns_ip_1 + (dns_ip_2 === '0.0.0.0' ? '' : ',' + dns_ip_2);
 };

 const IPs = (status: NetworkStatus) => {
@@ -60,33 +81,8 @@ const IPs = (status: NetworkStatus) => {
 const NetworkStatusForm: FC = () => {
  const { loadData, data, errorMessage } = useRest<NetworkStatus>({ read: NetworkApi.readNetworkStatus });

-  const { LL } = useI18nContext();
-
  const theme = useTheme();

-  const networkStatus = ({ status }: NetworkStatus) => {
-    switch (status) {
-      case NetworkConnectionStatus.WIFI_STATUS_NO_SHIELD:
-        return LL.INACTIVE(1);
-      case NetworkConnectionStatus.WIFI_STATUS_IDLE:
-        return LL.IDLE();
-      case NetworkConnectionStatus.WIFI_STATUS_NO_SSID_AVAIL:
-        return 'No SSID Available';
-      case NetworkConnectionStatus.WIFI_STATUS_CONNECTED:
-        return LL.CONNECTED(0) + ' (WiFi)';
-      case NetworkConnectionStatus.ETHERNET_STATUS_CONNECTED:
-        return LL.CONNECTED(0) + ' (Ethernet)';
-      case NetworkConnectionStatus.WIFI_STATUS_CONNECT_FAILED:
-        return LL.CONNECTED(1) + ' ' + LL.FAILED();
-      case NetworkConnectionStatus.WIFI_STATUS_CONNECTION_LOST:
-        return LL.CONNECTED(1) + ' ' + LL.LOST();
-      case NetworkConnectionStatus.WIFI_STATUS_DISCONNECTED:
-        return LL.DISCONNECTED();
-      default:
-        return LL.UNKNOWN();
-    }
-  };
-
  const content = () => {
    if (!data) {
      return <FormLoader onRetry={loadData} errorMessage={errorMessage} />;
@@ -124,7 +120,7 @@ const NetworkStatusForm: FC = () => {
                <ListItemAvatar>
                  <Avatar>IP</Avatar>
                </ListItemAvatar>
-                <ListItemText primary={LL.ADDRESS_OF('IP')} secondary={IPs(data)} />
+                <ListItemText primary="IP Address" secondary={IPs(data)} />
              </ListItem>
              <Divider variant="inset" component="li" />
              <ListItem>
@@ -133,14 +129,14 @@ const NetworkStatusForm: FC = () => {
                    <DeviceHubIcon />
                  </Avatar>
                </ListItemAvatar>
-                <ListItemText primary={LL.ADDRESS_OF('MAC')} secondary={data.mac_address} />
+                <ListItemText primary="MAC Address" secondary={data.mac_address} />
              </ListItem>
              <Divider variant="inset" component="li" />
              <ListItem>
                <ListItemAvatar>
                  <Avatar>#</Avatar>
                </ListItemAvatar>
-                <ListItemText primary={LL.NETWORK_SUBNET()} secondary={data.subnet_mask} />
+                <ListItemText primary="Subnet Mask" secondary={data.subnet_mask} />
              </ListItem>
              <Divider variant="inset" component="li" />
              <ListItem>
@@ -149,7 +145,7 @@ const NetworkStatusForm: FC = () => {
                    <SettingsInputComponentIcon />
                  </Avatar>
                </ListItemAvatar>
-                <ListItemText primary={LL.NETWORK_GATEWAY()} secondary={data.gateway_ip || 'none'} />
+                <ListItemText primary="Gateway IP" secondary={data.gateway_ip || 'none'} />
              </ListItem>
              <Divider variant="inset" component="li" />
              <ListItem>
@@ -158,7 +154,7 @@ const NetworkStatusForm: FC = () => {
                    <DnsIcon />
                  </Avatar>
                </ListItemAvatar>
-                <ListItemText primary={LL.NETWORK_DNS()} secondary={dnsServers(data)} />
+                <ListItemText primary="DNS Server IP" secondary={dnsServers(data)} />
              </ListItem>
              <Divider variant="inset" component="li" />
            </>
@@ -166,7 +162,7 @@ const NetworkStatusForm: FC = () => {
        </List>
        <ButtonRow>
          <Button startIcon={<RefreshIcon />} variant="outlined" color="secondary" onClick={loadData}>
-            {LL.REFRESH()}
+            Refresh
          </Button>
        </ButtonRow>
      </>
@@ -174,7 +170,7 @@ const NetworkStatusForm: FC = () => {
  };

  return (
-    <SectionContent title={LL.STATUS_OF(LL.NETWORK(1))} titleGutter>
+    <SectionContent title="Network Status" titleGutter>
      {content()}
    </SectionContent>
  );
--- a/interface/src/framework/network/WiFiNetworkScanner.tsx
+++ b/interface/src/framework/network/WiFiNetworkScanner.tsx
@@ -1,6 +1,8 @@
 import { useEffect, FC, useState, useCallback, useRef } from 'react';
 import { useSnackbar } from 'notistack';

+import { AxiosError } from 'axios';
+
 import { Button } from '@mui/material';
 import PermScanWifiIcon from '@mui/icons-material/PermScanWifi';

@@ -10,8 +12,6 @@ import { ButtonRow, FormLoader, SectionContent } from '../../components';

 import WiFiNetworkSelector from './WiFiNetworkSelector';

-import { useI18nContext } from '../../i18n/i18n-react';
-
 const NUM_POLLS = 10;
 const POLLING_FREQUENCY = 500;

@@ -22,8 +22,6 @@ const compareNetworks = (network1: WiFiNetwork, network2: WiFiNetwork) => {
 };

 const WiFiNetworkScanner: FC = () => {
-  const { LL } = useI18nContext();
-
  const { enqueueSnackbar } = useSnackbar();

  const pollCount = useRef(0);
@@ -48,21 +46,21 @@ const WiFiNetworkScanner: FC = () => {
          pollCount.current = completedPollCount;
          setTimeout(pollNetworkList, POLLING_FREQUENCY);
        } else {
-          finishedWithError(LL.PROBLEM_LOADING());
+          finishedWithError('Device did not return network list in timely manner');
        }
      } else {
        const newNetworkList = response.data;
        newNetworkList.networks.sort(compareNetworks);
        setNetworkList(newNetworkList);
      }
-    } catch (error) {
-      if (error.response) {
-        finishedWithError(LL.PROBLEM_LOADING() + ' ' + error.response?.data.message);
+    } catch (error: unknown) {
+      if (error instanceof AxiosError) {
+        finishedWithError('Problem listing WiFi networks ' + error.response?.data.message);
      } else {
-        finishedWithError(LL.PROBLEM_LOADING());
+        finishedWithError('Problem listing WiFi networks');
      }
    }
-  }, [finishedWithError, LL]);
+  }, [finishedWithError]);

  const startNetworkScan = useCallback(async () => {
    pollCount.current = 0;
@@ -71,14 +69,14 @@ const WiFiNetworkScanner: FC = () => {
    try {
      await NetworkApi.scanNetworks();
      setTimeout(pollNetworkList, POLLING_FREQUENCY);
-    } catch (error) {
-      if (error.response) {
-        finishedWithError(LL.PROBLEM_LOADING() + ' ' + error.response?.data.message);
+    } catch (error: unknown) {
+      if (error instanceof AxiosError) {
+        finishedWithError('Problem scanning for WiFi networks ' + error.response?.data.message);
      } else {
-        finishedWithError(LL.PROBLEM_LOADING());
+        finishedWithError('Problem scanning for WiFi networks');
      }
    }
-  }, [finishedWithError, pollNetworkList, LL]);
+  }, [finishedWithError, pollNetworkList]);

  useEffect(() => {
    startNetworkScan();
@@ -86,13 +84,13 @@ const WiFiNetworkScanner: FC = () => {

  const renderNetworkScanner = () => {
    if (!networkList) {
-      return <FormLoader message={LL.SCANNING() + '...'} errorMessage={errorMessage} />;
+      return <FormLoader message="Scanning&hellip;" errorMessage={errorMessage} />;
    }
    return <WiFiNetworkSelector networkList={networkList} />;
  };

  return (
-    <SectionContent title={LL.NETWORK_SCANNER()}>
+    <SectionContent title="Network Scanner">
      {renderNetworkScanner()}
      <ButtonRow>
        <Button
@@ -102,7 +100,7 @@ const WiFiNetworkScanner: FC = () => {
          onClick={startNetworkScan}
          disabled={!errorMessage && !networkList}
        >
-          {LL.SCAN_AGAIN()}&hellip;
+          Scan again&hellip;
        </Button>
      </ButtonRow>
    </SectionContent>
--- a/interface/src/framework/network/WiFiNetworkSelector.tsx
+++ b/interface/src/framework/network/WiFiNetworkSelector.tsx
@@ -12,8 +12,6 @@ import { WiFiEncryptionType, WiFiNetwork, WiFiNetworkList } from '../../types';

 import { WiFiConnectionContext } from './WiFiConnectionContext';

-import { useI18nContext } from '../../i18n/i18n-react';
-
 interface WiFiNetworkSelectorProps {
  networkList: WiFiNetworkList;
 }
@@ -41,8 +39,6 @@ export const networkSecurityMode = ({ encryption_type }: WiFiNetwork) => {
 };

 const WiFiNetworkSelector: FC<WiFiNetworkSelectorProps> = ({ networkList }) => {
-  const { LL } = useI18nContext();
-
  const wifiConnectionContext = useContext(WiFiConnectionContext);

  const renderNetwork = (network: WiFiNetwork) => {
@@ -65,7 +61,7 @@ const WiFiNetworkSelector: FC<WiFiNetworkSelectorProps> = ({ networkList }) => {
  };

  if (networkList.networks.length === 0) {
-    return <MessageBox mt={2} mb={1} message={LL.NETWORK_NO_WIFI()} level="info" />;
+    return <MessageBox mt={2} mb={1} message="No WiFi networks found" level="info" />;
  }

  return <List>{networkList.networks.map(renderNetwork)}</List>;
--- a/interface/src/framework/ntp/NTPSettingsForm.tsx
+++ b/interface/src/framework/ntp/NTPSettingsForm.tsx
@@ -12,16 +12,12 @@ import * as NTPApi from '../../api/ntp';
 import { selectedTimeZone, timeZoneSelectItems, TIME_ZONES } from './TZ';
 import { NTP_SETTINGS_VALIDATOR } from '../../validators/ntp';

-import { useI18nContext } from '../../i18n/i18n-react';
-
 const NTPSettingsForm: FC = () => {
  const { loadData, saving, data, setData, saveData, errorMessage } = useRest<NTPSettings>({
    read: NTPApi.readNTPSettings,
    update: NTPApi.updateNTPSettings
  });

-  const { LL } = useI18nContext();
-
  const updateFormValue = updateValue(setData);

  const [fieldErrors, setFieldErrors] = useState<ValidateFieldsError>();
@@ -53,12 +49,12 @@ const NTPSettingsForm: FC = () => {
      <>
        <BlockFormControlLabel
          control={<Checkbox name="enabled" checked={data.enabled} onChange={updateFormValue} />}
-          label={LL.ENABLE_NTP()}
+          label="Enable NTP"
        />
        <ValidatedTextField
          fieldErrors={fieldErrors}
          name="server"
-          label={LL.NTP_SERVER()}
+          label="Server"
          fullWidth
          variant="outlined"
          value={data.server}
@@ -68,7 +64,7 @@ const NTPSettingsForm: FC = () => {
        <ValidatedTextField
          fieldErrors={fieldErrors}
          name="tz_label"
-          label={LL.TIME_ZONE()}
+          label="Time zone"
          fullWidth
          variant="outlined"
          value={selectedTimeZone(data.tz_label, data.tz_format)}
@@ -76,7 +72,7 @@ const NTPSettingsForm: FC = () => {
          margin="normal"
          select
        >
-          <MenuItem disabled>{LL.TIME_ZONE()}...</MenuItem>
+          <MenuItem disabled>Time zone...</MenuItem>
          {timeZoneSelectItems()}
        </ValidatedTextField>
        <ButtonRow>
@@ -88,7 +84,7 @@ const NTPSettingsForm: FC = () => {
            type="submit"
            onClick={validateAndSubmit}
          >
-            {LL.SAVE()}
+            Save
          </Button>
        </ButtonRow>
      </>
@@ -96,7 +92,7 @@ const NTPSettingsForm: FC = () => {
  };

  return (
-    <SectionContent title={LL.SETTINGS_OF('NTP')} titleGutter>
+    <SectionContent title="NTP Settings" titleGutter>
      {content()}
    </SectionContent>
  );
--- a/interface/src/framework/ntp/NTPStatusForm.tsx
+++ b/interface/src/framework/ntp/NTPStatusForm.tsx
@@ -16,8 +16,7 @@ import {
  ListItemText,
  TextField,
  Theme,
-  useTheme,
-  Typography
+  useTheme
 } from '@mui/material';
 import RefreshIcon from '@mui/icons-material/Refresh';
 import AccessTimeIcon from '@mui/icons-material/AccessTime';
@@ -32,8 +31,6 @@ import { ButtonRow, FormLoader, SectionContent } from '../../components';
 import { extractErrorMessage, formatDateTime, formatLocalDateTime, useRest } from '../../utils';
 import { AuthenticatedContext } from '../../contexts/authentication';

-import { useI18nContext } from '../../i18n/i18n-react';
-
 export const isNtpActive = ({ status }: NTPStatus) => status === NTPSyncStatus.NTP_ACTIVE;
 export const isNtpEnabled = ({ status }: NTPStatus) => status !== NTPSyncStatus.NTP_DISABLED;

@@ -50,6 +47,19 @@ export const ntpStatusHighlight = ({ status }: NTPStatus, theme: Theme) => {
  }
 };

+export const ntpStatus = ({ status }: NTPStatus) => {
+  switch (status) {
+    case NTPSyncStatus.NTP_DISABLED:
+      return 'Disabled';
+    case NTPSyncStatus.NTP_INACTIVE:
+      return 'Inactive';
+    case NTPSyncStatus.NTP_ACTIVE:
+      return 'Active';
+    default:
+      return 'Unknown';
+  }
+};
+
 const NTPStatusForm: FC = () => {
  const { loadData, data, errorMessage } = useRest<NTPStatus>({ read: NTPApi.readNTPStatus });
  const [localTime, setLocalTime] = useState<string>('');
@@ -58,8 +68,6 @@ const NTPStatusForm: FC = () => {
  const { enqueueSnackbar } = useSnackbar();
  const { me } = useContext(AuthenticatedContext);

-  const { LL } = useI18nContext();
-
  const updateLocalTime = (event: React.ChangeEvent<HTMLInputElement>) => setLocalTime(event.target.value);

  const openSetTime = () => {
@@ -69,71 +77,59 @@ const NTPStatusForm: FC = () => {

  const theme = useTheme();

-  const ntpStatus = ({ status }: NTPStatus) => {
-    switch (status) {
-      case NTPSyncStatus.NTP_DISABLED:
-        return LL.DISABLED(0);
-      case NTPSyncStatus.NTP_INACTIVE:
-        return LL.INACTIVE(0);
-      case NTPSyncStatus.NTP_ACTIVE:
-        return LL.ACTIVE();
-      default:
-        return LL.UNKNOWN();
-    }
-  };
-
  const configureTime = async () => {
    setProcessing(true);
    try {
      await NTPApi.updateTime({
        local_time: formatLocalDateTime(new Date(localTime))
      });
-      enqueueSnackbar(LL.TIME_SET(), { variant: 'success' });
+      enqueueSnackbar('Time set', { variant: 'success' });
      setSettingTime(false);
      loadData();
-    } catch (error) {
-      enqueueSnackbar(extractErrorMessage(error, LL.PROBLEM_UPDATING()), { variant: 'error' });
+    } catch (error: unknown) {
+      enqueueSnackbar(extractErrorMessage(error, 'Problem updating time'), { variant: 'error' });
    } finally {
      setProcessing(false);
    }
  };

-  const renderSetTimeDialog = () => (
-    <Dialog open={settingTime} onClose={() => setSettingTime(false)}>
-      <DialogTitle>{LL.SET_TIME(1)}</DialogTitle>
-      <DialogContent dividers>
-        <Box color="warning.main" p={0} pl={0} pr={0} mt={0} mb={2}>
-          <Typography variant="body2">{LL.SET_TIME_TEXT()}</Typography>
-        </Box>
-        <TextField
-          label={LL.LOCAL_TIME()}
-          type="datetime-local"
-          value={localTime}
-          onChange={updateLocalTime}
-          disabled={processing}
-          fullWidth
-          InputLabelProps={{
-            shrink: true
-          }}
-        />
-      </DialogContent>
-      <DialogActions>
-        <Button startIcon={<CancelIcon />} variant="outlined" onClick={() => setSettingTime(false)} color="secondary">
-          {LL.CANCEL()}
-        </Button>
-        <Button
-          startIcon={<AccessTimeIcon />}
-          variant="outlined"
-          onClick={configureTime}
-          disabled={processing}
-          color="primary"
-          autoFocus
-        >
-          {LL.SAVE()}
-        </Button>
-      </DialogActions>
-    </Dialog>
-  );
+  const renderSetTimeDialog = () => {
+    return (
+      <Dialog open={settingTime} onClose={() => setSettingTime(false)}>
+        <DialogTitle>Set Time</DialogTitle>
+        <DialogContent dividers>
+          <Box mb={2}>Enter local date and time below to set the device's time.</Box>
+          <TextField
+            label="Local Time"
+            type="datetime-local"
+            value={localTime}
+            onChange={updateLocalTime}
+            disabled={processing}
+            variant="outlined"
+            fullWidth
+            InputLabelProps={{
+              shrink: true
+            }}
+          />
+        </DialogContent>
+        <DialogActions>
+          <Button startIcon={<CancelIcon />} variant="outlined" onClick={() => setSettingTime(false)} color="secondary">
+            Cancel
+          </Button>
+          <Button
+            startIcon={<AccessTimeIcon />}
+            variant="outlined"
+            onClick={configureTime}
+            disabled={processing}
+            color="primary"
+            autoFocus
+          >
+            Set Time
+          </Button>
+        </DialogActions>
+      </Dialog>
+    );
+  };

  const content = () => {
    if (!data) {
@@ -149,7 +145,7 @@ const NTPStatusForm: FC = () => {
                <UpdateIcon />
              </Avatar>
            </ListItemAvatar>
-            <ListItemText primary={LL.STATUS_OF('')} secondary={ntpStatus(data)} />
+            <ListItemText primary="Status" secondary={ntpStatus(data)} />
          </ListItem>
          <Divider variant="inset" component="li" />
          {isNtpEnabled(data) && (
@@ -160,7 +156,7 @@ const NTPStatusForm: FC = () => {
                    <DnsIcon />
                  </Avatar>
                </ListItemAvatar>
-                <ListItemText primary={LL.NTP_SERVER()} secondary={data.server} />
+                <ListItemText primary="NTP Server" secondary={data.server} />
              </ListItem>
              <Divider variant="inset" component="li" />
            </>
@@ -171,7 +167,7 @@ const NTPStatusForm: FC = () => {
                <AccessTimeIcon />
              </Avatar>
            </ListItemAvatar>
-            <ListItemText primary={LL.LOCAL_TIME()} secondary={formatDateTime(data.local_time)} />
+            <ListItemText primary="Local Time" secondary={formatDateTime(data.local_time)} />
          </ListItem>
          <Divider variant="inset" component="li" />
          <ListItem>
@@ -180,7 +176,7 @@ const NTPStatusForm: FC = () => {
                <SwapVerticalCircleIcon />
              </Avatar>
            </ListItemAvatar>
-            <ListItemText primary={LL.UTC_TIME()} secondary={formatDateTime(data.utc_time)} />
+            <ListItemText primary="UTC Time" secondary={formatDateTime(data.utc_time)} />
          </ListItem>
          <Divider variant="inset" component="li" />
        </List>
@@ -188,7 +184,7 @@ const NTPStatusForm: FC = () => {
          <Box flexGrow={1}>
            <ButtonRow>
              <Button startIcon={<RefreshIcon />} variant="outlined" color="secondary" onClick={loadData}>
-                {LL.REFRESH()}
+                Refresh
              </Button>
            </ButtonRow>
          </Box>
@@ -196,7 +192,7 @@ const NTPStatusForm: FC = () => {
            <Box flexWrap="nowrap" whiteSpace="nowrap">
              <ButtonRow>
                <Button onClick={openSetTime} variant="outlined" color="primary" startIcon={<AccessTimeIcon />}>
-                  {LL.SET_TIME(0)}
+                  Set Time
                </Button>
              </ButtonRow>
            </Box>
@@ -208,7 +204,7 @@ const NTPStatusForm: FC = () => {
  };

  return (
-    <SectionContent title={LL.STATUS_OF('NTP')} titleGutter>
+    <SectionContent title="NTP Status" titleGutter>
      {content()}
    </SectionContent>
  );
--- a/interface/src/framework/ntp/NetworkTime.tsx
+++ b/interface/src/framework/ntp/NetworkTime.tsx
@@ -9,11 +9,8 @@ import { AuthenticatedContext } from '../../contexts/authentication';
 import NTPStatusForm from './NTPStatusForm';
 import NTPSettingsForm from './NTPSettingsForm';

-import { useI18nContext } from '../../i18n/i18n-react';
-
 const NetworkTime: FC = () => {
-  const { LL } = useI18nContext();
-  useLayoutTitle('NTP');
+  useLayoutTitle('Network Time');

  const authenticatedContext = useContext(AuthenticatedContext);
  const { routerTab } = useRouterTab();
@@ -21,8 +18,8 @@ const NetworkTime: FC = () => {
  return (
    <>
      <RouterTabs value={routerTab}>
-        <Tab value="status" label={LL.STATUS_OF('NTP')} />
-        <Tab value="settings" label={LL.SETTINGS_OF('NTP')} disabled={!authenticatedContext.me.admin} />
+        <Tab value="status" label="NTP Status" />
+        <Tab value="settings" label="NTP Settings" disabled={!authenticatedContext.me.admin} />
      </RouterTabs>
      <Routes>
        <Route path="status" element={<NTPStatusForm />} />
--- a/interface/src/framework/security/GenerateToken.tsx
+++ b/interface/src/framework/security/GenerateToken.tsx
@@ -19,8 +19,6 @@ import { MessageBox } from '../../components';
 import * as SecurityApi from '../../api/security';
 import { Token } from '../../types';

-import { useI18nContext } from '../../i18n/i18n-react';
-
 interface GenerateTokenProps {
  username?: string;
  onClose: () => void;
@@ -30,17 +28,15 @@ const GenerateToken: FC<GenerateTokenProps> = ({ username, onClose }) => {
  const [token, setToken] = useState<Token>();
  const open = !!username;

-  const { LL } = useI18nContext();
-
  const { enqueueSnackbar } = useSnackbar();

  const getToken = useCallback(async () => {
    try {
      setToken((await SecurityApi.generateToken(username)).data);
-    } catch (error) {
-      enqueueSnackbar(extractErrorMessage(error, LL.PROBLEM_UPDATING()), { variant: 'error' });
+    } catch (error: unknown) {
+      enqueueSnackbar(extractErrorMessage(error, 'Problem generating token'), { variant: 'error' });
    }
-  }, [username, enqueueSnackbar, LL]);
+  }, [username, enqueueSnackbar]);

  useEffect(() => {
    if (open) {
@@ -50,11 +46,16 @@ const GenerateToken: FC<GenerateTokenProps> = ({ username, onClose }) => {

  return (
    <Dialog onClose={onClose} aria-labelledby="generate-token-dialog-title" open={!!username} fullWidth maxWidth="sm">
-      <DialogTitle id="generate-token-dialog-title">{LL.ACCESS_TOKEN_FOR() + ' ' + username}</DialogTitle>
+      <DialogTitle id="generate-token-dialog-title">Access Token for {username}</DialogTitle>
      <DialogContent dividers>
        {token ? (
          <>
-            <MessageBox message={LL.ACCESS_TOKEN_TEXT()} level="info" my={2} />
+            <MessageBox
+              message="The token below is used with REST API calls that require authorization. It can be passed either as a Bearer token in the
+        'Authorization' header or in the 'access_token' URL query parameter."
+              level="info"
+              my={2}
+            />
            <Box mt={2} mb={2}>
              <TextField label="Token" multiline value={token.token} fullWidth contentEditable={false} />
            </Box>
@@ -62,13 +63,13 @@ const GenerateToken: FC<GenerateTokenProps> = ({ username, onClose }) => {
        ) : (
          <Box m={4} textAlign="center">
            <LinearProgress />
-            <Typography variant="h6">{LL.GENERATING_TOKEN()}&hellip;</Typography>
+            <Typography variant="h6">Generating token&hellip;</Typography>
          </Box>
        )}
      </DialogContent>
      <DialogActions>
        <Button startIcon={<CloseIcon />} variant="outlined" onClick={onClose} color="secondary">
-          {LL.CLOSE()}
+          Close
        </Button>
      </DialogActions>
    </Dialog>
--- a/interface/src/framework/security/ManageUsersForm.tsx
+++ b/interface/src/framework/security/ManageUsersForm.tsx
@@ -20,8 +20,6 @@ import { createUserValidator } from '../../validators';
 import { useRest } from '../../utils';
 import { AuthenticatedContext } from '../../contexts/authentication';

-import { useI18nContext } from '../../i18n/i18n-react';
-
 import GenerateToken from './GenerateToken';
 import UserForm from './UserForm';

@@ -36,47 +34,44 @@ const ManageUsersForm: FC = () => {
  const [generatingToken, setGeneratingToken] = useState<string>();
  const authenticatedContext = useContext(AuthenticatedContext);

-  const { LL } = useI18nContext();
-
  const table_theme = useTheme({
-    Table: `
-      --data-table-library_grid-template-columns: repeat(1, minmax(0, 1fr)) minmax(120px, max-content) 120px;
-    `,
    BaseRow: `
      font-size: 14px;
+      color: white;
+      padding-left: 8px;
    `,
    HeaderRow: `
      text-transform: uppercase;
      background-color: black;
      color: #90CAF9;
-      .th {
-        padding: 8px;
-        height: 42px;
-        font-weight: 500;
-        border-bottom: 1px solid #565656;
-      }
+      font-weight: 500;
+      border-bottom: 1px solid #e0e0e0;
    `,
    Row: `
-      .td {
-        padding: 8px;
-        border-top: 1px solid #565656;
-        border-bottom: 1px solid #565656;
-      }
-
-      &:nth-of-type(odd) .td {
+      &:nth-of-type(odd) {
        background-color: #303030;
      }
-      &:nth-of-type(even) .td {
+      &:nth-of-type(even) {
        background-color: #1e1e1e;
      }
+      border-top: 1px solid #565656;
+      border-bottom: 1px solid #565656;
+      position: relative;
+      z-index: 1;
+      &:not(:last-of-type) {
+        margin-bottom: -1px;
+      }
+      &:not(:first-of-type) {
+        margin-top: -1px;
+      }
+      &:hover {
+        color: white;
+      }
    `,
    BaseCell: `
-      &:nth-of-type(2) {
-        text-align: center;
-      }
-      &:last-of-type {
-        text-align: right;
-      }
+      border-top: 1px solid transparent;
+      border-right: 1px solid transparent;
+      border-bottom: 1px solid transparent;
    `
  });

@@ -135,22 +130,22 @@ const ManageUsersForm: FC = () => {

    return (
      <>
-        <Table data={{ nodes: user_table }} theme={table_theme} layout={{ custom: true }}>
+        <Table data={{ nodes: user_table }} theme={table_theme}>
          {(tableList: any) => (
            <>
              <Header>
                <HeaderRow>
-                  <HeaderCell resize>{LL.USERNAME(1)}</HeaderCell>
-                  <HeaderCell stiff>{LL.IS_ADMIN(0)}</HeaderCell>
-                  <HeaderCell stiff />
+                  <HeaderCell>USERNAME</HeaderCell>
+                  <HeaderCell>IS ADMIN</HeaderCell>
+                  <HeaderCell />
                </HeaderRow>
              </Header>
              <Body>
                {tableList.map((u: any) => (
                  <Row key={u.id} item={u}>
                    <Cell>{u.username}</Cell>
-                    <Cell stiff>{u.admin ? <CheckIcon /> : <CloseIcon />}</Cell>
-                    <Cell stiff>
+                    <Cell>{u.admin ? <CheckIcon /> : <CloseIcon />}</Cell>
+                    <Cell>
                      <IconButton
                        size="small"
                        disabled={!authenticatedContext.me.admin}
@@ -173,7 +168,9 @@ const ManageUsersForm: FC = () => {
          )}
        </Table>

-        {noAdminConfigured() && <MessageBox level="warning" message={LL.USER_WARNING()} my={2} />}
+        {noAdminConfigured() && (
+          <MessageBox level="warning" message="You must have at least one admin user configured" my={2} />
+        )}

        <Box display="flex" flexWrap="wrap">
          <Box flexGrow={1} sx={{ '& button': { mt: 2 } }}>
@@ -185,14 +182,14 @@ const ManageUsersForm: FC = () => {
              type="submit"
              onClick={onSubmit}
            >
-              {LL.SAVE()}
+              Save
            </Button>
          </Box>

          <Box flexWrap="nowrap" whiteSpace="nowrap">
            <ButtonRow>
              <Button startIcon={<PersonAddIcon />} variant="outlined" color="secondary" onClick={createUser}>
-                {LL.ADD(0)}
+                Add
              </Button>
            </ButtonRow>
          </Box>
@@ -212,7 +209,7 @@ const ManageUsersForm: FC = () => {
  };

  return (
-    <SectionContent title={LL.MANAGE_USERS()} titleGutter>
+    <SectionContent title="Manage Users" titleGutter>
      {content()}
    </SectionContent>
  );
--- a/interface/src/framework/security/Security.tsx
+++ b/interface/src/framework/security/Security.tsx
@@ -8,19 +8,16 @@ import { RouterTabs, useRouterTab, useLayoutTitle } from '../../components';
 import SecuritySettingsForm from './SecuritySettingsForm';
 import ManageUsersForm from './ManageUsersForm';

-import { useI18nContext } from '../../i18n/i18n-react';
-
 const Security: FC = () => {
-  const { LL } = useI18nContext();
-  useLayoutTitle(LL.SECURITY(0));
+  useLayoutTitle('Security');

  const { routerTab } = useRouterTab();

  return (
    <>
      <RouterTabs value={routerTab}>
-        <Tab value="users" label={LL.MANAGE_USERS()} />
-        <Tab value="settings" label={LL.SETTINGS_OF(LL.SECURITY(1))} />
+        <Tab value="users" label="Manage Users" />
+        <Tab value="settings" label="Security Settings" />
      </RouterTabs>
      <Routes>
        <Route path="users" element={<ManageUsersForm />} />
--- a/interface/src/framework/security/SecuritySettingsForm.tsx
+++ b/interface/src/framework/security/SecuritySettingsForm.tsx
@@ -11,11 +11,7 @@ import { SECURITY_SETTINGS_VALIDATOR, validate } from '../../validators';
 import { updateValue, useRest } from '../../utils';
 import { AuthenticatedContext } from '../../contexts/authentication';

-import { useI18nContext } from '../../i18n/i18n-react';
-
 const SecuritySettingsForm: FC = () => {
-  const { LL } = useI18nContext();
-
  const [fieldErrors, setFieldErrors] = useState<ValidateFieldsError>();
  const { loadData, saving, data, setData, saveData, errorMessage } = useRest<SecuritySettings>({
    read: SecurityApi.readSecuritySettings,
@@ -46,14 +42,18 @@ const SecuritySettingsForm: FC = () => {
        <ValidatedPasswordField
          fieldErrors={fieldErrors}
          name="jwt_secret"
-          label={LL.SU_PASSWORD()}
+          label="su Password"
          fullWidth
          variant="outlined"
          value={data.jwt_secret}
          onChange={updateFormValue}
          margin="normal"
        />
-        <MessageBox level="info" message={LL.SU_TEXT()} mt={1} />
+        <MessageBox
+          level="info"
+          message="The su (super user) password is used to sign authentication tokens and also enable admin privileges within the Console."
+          mt={1}
+        />
        <ButtonRow>
          <Button
            startIcon={<SaveIcon />}
@@ -63,7 +63,7 @@ const SecuritySettingsForm: FC = () => {
            type="submit"
            onClick={validateAndSubmit}
          >
-            {LL.SAVE()}
+            Save
          </Button>
        </ButtonRow>
      </>
@@ -71,7 +71,7 @@ const SecuritySettingsForm: FC = () => {
  };

  return (
-    <SectionContent title={LL.SETTINGS_OF(LL.SECURITY(1))} titleGutter>
+    <SectionContent title="Security Settings" titleGutter>
      {content()}
    </SectionContent>
  );
--- a/interface/src/framework/security/UserForm.tsx
+++ b/interface/src/framework/security/UserForm.tsx
@@ -3,7 +3,6 @@ import Schema, { ValidateFieldsError } from 'async-validator';

 import CancelIcon from '@mui/icons-material/Cancel';
 import PersonAddIcon from '@mui/icons-material/PersonAdd';
-import SaveIcon from '@mui/icons-material/Save';

 import { Button, Checkbox, Dialog, DialogActions, DialogContent, DialogTitle } from '@mui/material';

@@ -12,8 +11,6 @@ import { User } from '../../types';
 import { updateValue } from '../../utils';
 import { validate } from '../../validators';

-import { useI18nContext } from '../../i18n/i18n-react';
-
 interface UserFormProps {
  creating: boolean;
  validator: Schema;
@@ -26,8 +23,6 @@ interface UserFormProps {
 }

 const UserForm: FC<UserFormProps> = ({ creating, validator, user, setUser, onDoneEditing, onCancelEditing }) => {
-  const { LL } = useI18nContext();
-
  const updateFormValue = updateValue(setUser);
  const [fieldErrors, setFieldErrors] = useState<ValidateFieldsError>();
  const open = !!user;
@@ -54,14 +49,12 @@ const UserForm: FC<UserFormProps> = ({ creating, validator, user, setUser, onDon
    <Dialog onClose={onCancelEditing} open={!!user} fullWidth maxWidth="sm">
      {user && (
        <>
-          <DialogTitle id="user-form-dialog-title">
-            {creating ? LL.ADD(1) : LL.MODIFY()}&nbsp;{LL.USER(1)}
-          </DialogTitle>
+          <DialogTitle id="user-form-dialog-title">{creating ? 'Add' : 'Modify'} User</DialogTitle>
          <DialogContent dividers>
            <ValidatedTextField
              fieldErrors={fieldErrors}
              name="username"
-              label={LL.USERNAME(1)}
+              label="Username"
              fullWidth
              variant="outlined"
              value={user.username}
@@ -72,7 +65,7 @@ const UserForm: FC<UserFormProps> = ({ creating, validator, user, setUser, onDon
            <ValidatedPasswordField
              fieldErrors={fieldErrors}
              name="password"
-              label={LL.PASSWORD()}
+              label="Password"
              fullWidth
              variant="outlined"
              value={user.password}
@@ -81,21 +74,21 @@ const UserForm: FC<UserFormProps> = ({ creating, validator, user, setUser, onDon
            />
            <BlockFormControlLabel
              control={<Checkbox name="admin" checked={user.admin} onChange={updateFormValue} />}
-              label={LL.IS_ADMIN(1)}
+              label="is Admin?"
            />
          </DialogContent>
          <DialogActions>
            <Button startIcon={<CancelIcon />} variant="outlined" onClick={onCancelEditing} color="secondary">
-              {LL.CANCEL()}
+              Cancel
            </Button>
            <Button
-              startIcon={creating ? <PersonAddIcon /> : <SaveIcon />}
+              startIcon={<PersonAddIcon />}
              variant="outlined"
              onClick={validateAndDone}
              color="primary"
              autoFocus
            >
-              {creating ? LL.ADD(0) : LL.SAVE()}
+              Add
            </Button>
          </DialogActions>
        </>
--- a/interface/src/framework/system/GeneralFileUpload.tsx
+++ b/interface/src/framework/system/GeneralFileUpload.tsx
@@ -1,121 +1,26 @@
-import { FC } from 'react';
 import { AxiosPromise } from 'axios';
-
-import { Typography, Button, Box } from '@mui/material';
+import { FC } from 'react';

 import { FileUploadConfig } from '../../api/endpoints';
-
-import { SingleUpload, useFileUpload } from '../../components';
-
-import DownloadIcon from '@mui/icons-material/GetApp';
-
-import { useSnackbar } from 'notistack';
-
-import { extractErrorMessage } from '../../utils';
-
-import * as EMSESP from '../../project/api';
-
-import { useI18nContext } from '../../i18n/i18n-react';
+import { MessageBox, SingleUpload, useFileUpload } from '../../components';

 interface UploadFileProps {
  uploadGeneralFile: (file: File, config?: FileUploadConfig) => AxiosPromise<void>;
 }

 const GeneralFileUpload: FC<UploadFileProps> = ({ uploadGeneralFile }) => {
-  const [uploadFile, cancelUpload, uploading, uploadProgress, md5] = useFileUpload({ upload: uploadGeneralFile });
-
-  const { enqueueSnackbar } = useSnackbar();
-
-  const { LL } = useI18nContext();
-
-  const saveFile = (json: any, endpoint: string) => {
-    const a = document.createElement('a');
-    const filename = 'emsesp_' + endpoint + '.json';
-    a.href = URL.createObjectURL(
-      new Blob([JSON.stringify(json, null, 2)], {
-        type: 'text/plain'
-      })
-    );
-    a.setAttribute('download', filename);
-    document.body.appendChild(a);
-    a.click();
-    document.body.removeChild(a);
-    enqueueSnackbar(LL.DOWNLOAD_SUCCESSFUL(), { variant: 'info' });
-  };
-
-  const downloadSettings = async () => {
-    try {
-      const response = await EMSESP.getSettings();
-      if (response.status !== 200) {
-        enqueueSnackbar(LL.PROBLEM_LOADING(), { variant: 'error' });
-      } else {
-        saveFile(response.data, 'settings');
-      }
-    } catch (error) {
-      enqueueSnackbar(extractErrorMessage(error, LL.PROBLEM_LOADING()), { variant: 'error' });
-    }
-  };
-
-  const downloadCustomizations = async () => {
-    try {
-      const response = await EMSESP.getCustomizations();
-      if (response.status !== 200) {
-        enqueueSnackbar(LL.PROBLEM_LOADING(), { variant: 'error' });
-      } else {
-        saveFile(response.data, 'customizations');
-      }
-    } catch (error) {
-      enqueueSnackbar(extractErrorMessage(error, LL.PROBLEM_LOADING()), { variant: 'error' });
-    }
-  };
+  const [uploadFile, cancelUpload, uploading, uploadProgress] = useFileUpload({ upload: uploadGeneralFile });

  return (
    <>
      {!uploading && (
-        <>
-          <Typography sx={{ pt: 2, pb: 2 }} variant="h6" color="primary">
-            {LL.UPLOAD()}
-          </Typography>
-          <Box mb={2} color="warning.main">
-            <Typography variant="body2">{LL.UPLOAD_TEXT()} </Typography>
-          </Box>
-        </>
-      )}
-      {md5 !== '' && (
-        <Box mb={2}>
-          <Typography variant="body2">{'MD5: ' + md5}</Typography>
-        </Box>
+        <MessageBox
+          message="Upload a new firmware (.bin) file or an exported settings or customizations (.json) file below. EMS-ESP will restart afterwards to apply the new changes."
+          level="warning"
+          my={2}
+        />
      )}
      <SingleUpload onDrop={uploadFile} onCancel={cancelUpload} uploading={uploading} progress={uploadProgress} />
-
-      {!uploading && (
-        <>
-          <Typography sx={{ pt: 2, pb: 2 }} variant="h6" color="primary">
-            {LL.DOWNLOAD(0)}
-          </Typography>
-          <Box color="warning.main">
-            <Typography mb={1} variant="body2">
-              {LL.DOWNLOAD_SETTINGS_TEXT()}
-            </Typography>
-          </Box>
-          <Button startIcon={<DownloadIcon />} variant="outlined" color="primary" onClick={() => downloadSettings()}>
-            {LL.SETTINGS_OF('')}
-          </Button>
-          <Box color="warning.main">
-            <Typography mt={2} mb={1} variant="body2">
-              {LL.DOWNLOAD_CUSTOMIZATION_TEXT()}{' '}
-            </Typography>
-          </Box>
-          <Button
-            startIcon={<DownloadIcon />}
-            variant="outlined"
-            color="primary"
-            onClick={() => downloadCustomizations()}
-          >
-            {LL.CUSTOMIZATION()}
-          </Button>
-        </>
-      )}
    </>
  );
 };
--- a/interface/src/framework/system/OTASettingsForm.tsx
+++ b/interface/src/framework/system/OTASettingsForm.tsx
@@ -12,7 +12,6 @@ import {
  ValidatedPasswordField,
  ValidatedTextField
 } from '../../components';
-
 import { OTASettings } from '../../types';
 import { numberValue, updateValue, useRest } from '../../utils';

@@ -20,16 +19,12 @@ import { ValidateFieldsError } from 'async-validator';
 import { validate } from '../../validators';
 import { OTA_SETTINGS_VALIDATOR } from '../../validators/system';

-import { useI18nContext } from '../../i18n/i18n-react';
-
 const OTASettingsForm: FC = () => {
  const { loadData, saving, data, setData, saveData, errorMessage } = useRest<OTASettings>({
    read: SystemApi.readOTASettings,
    update: SystemApi.updateOTASettings
  });

-  const { LL } = useI18nContext();
-
  const updateFormValue = updateValue(setData);

  const [fieldErrors, setFieldErrors] = useState<ValidateFieldsError>();
@@ -53,7 +48,7 @@ const OTASettingsForm: FC = () => {
      <>
        <BlockFormControlLabel
          control={<Checkbox name="enabled" checked={data.enabled} onChange={updateFormValue} />}
-          label={LL.ENABLE_OTA()}
+          label="Enable OTA Updates"
        />
        <ValidatedTextField
          fieldErrors={fieldErrors}
@@ -69,7 +64,7 @@ const OTASettingsForm: FC = () => {
        <ValidatedPasswordField
          fieldErrors={fieldErrors}
          name="password"
-          label={LL.PASSWORD()}
+          label="Password"
          fullWidth
          variant="outlined"
          value={data.password}
@@ -85,7 +80,7 @@ const OTASettingsForm: FC = () => {
            type="submit"
            onClick={validateAndSubmit}
          >
-            {LL.SAVE()}
+            Save
          </Button>
        </ButtonRow>
      </>
@@ -93,7 +88,7 @@ const OTASettingsForm: FC = () => {
  };

  return (
-    <SectionContent title={LL.SETTINGS_OF('OTA')} titleGutter>
+    <SectionContent title="OTA Settings" titleGutter>
      {content()}
    </SectionContent>
  );
--- a/interface/src/framework/system/RestartMonitor.tsx
+++ b/interface/src/framework/system/RestartMonitor.tsx
@@ -4,8 +4,6 @@ import { FC, useRef, useState } from 'react';
 import * as SystemApi from '../../api/system';
 import { FormLoader } from '../../components';

-import { useI18nContext } from '../../i18n/i18n-react';
-
 const RESTART_TIMEOUT = 2 * 60 * 1000;
 const POLL_TIMEOUT = 2000;
 const POLL_INTERVAL = 5000;
@@ -14,14 +12,12 @@ const RestartMonitor: FC = () => {
  const [failed, setFailed] = useState<boolean>(false);
  const [timeoutId, setTimeoutId] = useState<NodeJS.Timeout>();

-  const { LL } = useI18nContext();
-
  const timeoutAt = useRef(new Date().getTime() + RESTART_TIMEOUT);
  const poll = useRef(async () => {
    try {
      await SystemApi.readSystemStatus(POLL_TIMEOUT);
      document.location.href = '/fileUpdated';
-    } catch (error) {
+    } catch (error: unknown) {
      if (new Date().getTime() < timeoutAt.current) {
        setTimeoutId(setTimeout(poll.current, POLL_INTERVAL));
      } else {
@@ -36,7 +32,12 @@ const RestartMonitor: FC = () => {

  useEffect(() => () => timeoutId && clearTimeout(timeoutId), [timeoutId]);

-  return <FormLoader message={LL.APPLICATION_RESTARTING() + '...'} errorMessage={failed ? 'Timed out' : undefined} />;
+  return (
+    <FormLoader
+      message="EMS-ESP is restarting, please wait&hellip;"
+      errorMessage={failed ? 'Timed out waiting for device to restart.' : undefined}
+    />
+  );
 };

 export default RestartMonitor;
--- a/interface/src/framework/system/System.tsx
+++ b/interface/src/framework/system/System.tsx
@@ -12,12 +12,8 @@ import OTASettingsForm from './OTASettingsForm';

 import SystemLog from './SystemLog';

-import { useI18nContext } from '../../i18n/i18n-react';
-
 const System: FC = () => {
-  const { LL } = useI18nContext();
-
-  useLayoutTitle(LL.SYSTEM(0));
+  useLayoutTitle('System');

  const { me } = useContext(AuthenticatedContext);
  const { features } = useContext(FeaturesContext);
@@ -26,11 +22,11 @@ const System: FC = () => {
  return (
    <>
      <RouterTabs value={routerTab}>
-        <Tab value="status" label={LL.STATUS_OF(LL.SYSTEM(1))} />
-        <Tab value="log" label={LL.LOG_OF(LL.SYSTEM(2))} />
+        <Tab value="status" label="System Status" />
+        <Tab value="log" label="System Log" />

-        {features.ota && <Tab value="ota" label={LL.SETTINGS_OF('OTA')} disabled={!me.admin} />}
-        {features.upload_firmware && <Tab value="upload" label={LL.UPLOAD_DOWNLOAD()} disabled={!me.admin} />}
+        {features.ota && <Tab value="ota" label="OTA Settings" disabled={!me.admin} />}
+        {features.upload_firmware && <Tab value="upload" label="Upload" disabled={!me.admin} />}
      </RouterTabs>
      <Routes>
        <Route path="status" element={<SystemStatusForm />} />
--- a/interface/src/framework/system/SystemLog.tsx
+++ b/interface/src/framework/system/SystemLog.tsx
@@ -15,9 +15,6 @@ import DownloadIcon from '@mui/icons-material/GetApp';
 import { useSnackbar } from 'notistack';

 import { EVENT_SOURCE_ROOT } from '../../api/endpoints';
-
-import { useI18nContext } from '../../i18n/i18n-react';
-
 export const LOG_EVENTSOURCE_URL = EVENT_SOURCE_ROOT + 'log';

 const useWindowSize = () => {
@@ -66,13 +63,12 @@ const levelLabel = (level: LogLevel) => {
 const SystemLog: FC = () => {
  useWindowSize();

-  const { LL } = useI18nContext();
-
  const { loadData, data, setData } = useRest<LogSettings>({
    read: SystemApi.readLogSettings
  });

  const [errorMessage, setErrorMessage] = useState<string>();
+  const [reconnectTimeout, setReconnectTimeout] = useState<NodeJS.Timeout>();
  const [logEntries, setLogEntries] = useState<LogEntries>({ events: [] });
  const [lastIndex, setLastIndex] = useState<number>(0);

@@ -108,10 +104,10 @@ const SystemLog: FC = () => {
          compact: data.compact
        });
        if (response.status !== 200) {
-          enqueueSnackbar(LL.PROBLEM_UPDATING(), { variant: 'error' });
+          enqueueSnackbar('Problem applying log settings', { variant: 'error' });
        }
-      } catch (error) {
-        enqueueSnackbar(extractErrorMessage(error, LL.PROBLEM_UPDATING()), { variant: 'error' });
+      } catch (error: unknown) {
+        enqueueSnackbar(extractErrorMessage(error, 'Problem applying log settings'), { variant: 'error' });
      }
    }
  };
@@ -161,11 +157,11 @@ const SystemLog: FC = () => {

  const fetchLog = useCallback(async () => {
    try {
-      await SystemApi.readLogEntries();
-    } catch (error) {
-      setErrorMessage(extractErrorMessage(error, LL.PROBLEM_LOADING()));
+      setLogEntries((await SystemApi.readLogEntries()).data);
+    } catch (error: unknown) {
+      setErrorMessage(extractErrorMessage(error, 'Failed to fetch log'));
    }
-  }, [LL]);
+  }, []);

  useEffect(() => {
    fetchLog();
@@ -175,14 +171,20 @@ const SystemLog: FC = () => {
    const es = new EventSource(addAccessTokenParameter(LOG_EVENTSOURCE_URL));
    es.onmessage = onMessage;
    es.onerror = () => {
-      es.close();
-      reloadPage();
+      if (reconnectTimeout) {
+        es.close();
+        setReconnectTimeout(setTimeout(reloadPage, 1000));
+      }
    };
+
    return () => {
      es.close();
+      if (reconnectTimeout) {
+        clearTimeout(reconnectTimeout);
+      }
    };
    // eslint-disable-next-line
-  }, []);
+  }, [reconnectTimeout]);

  const content = () => {
    if (!data) {
@@ -195,7 +197,7 @@ const SystemLog: FC = () => {
          <Grid item xs={4}>
            <ValidatedTextField
              name="level"
-              label={LL.LOG_LEVEL()}
+              label="Log Level"
              value={data.level}
              fullWidth
              variant="outlined"
@@ -203,7 +205,6 @@ const SystemLog: FC = () => {
              margin="normal"
              select
            >
-              <MenuItem value={-1}>OFF</MenuItem>
              <MenuItem value={3}>ERROR</MenuItem>
              <MenuItem value={4}>WARNING</MenuItem>
              <MenuItem value={5}>NOTICE</MenuItem>
@@ -213,7 +214,7 @@ const SystemLog: FC = () => {
            </ValidatedTextField>
          </Grid>
          <Grid item xs={3}>
-            <FormLabel>{LL.BUFFER_SIZE()}</FormLabel>
+            <FormLabel>Buffer size</FormLabel>
            <Slider
              value={data.max_messages}
              valueLabelDisplay="auto"
@@ -234,12 +235,12 @@ const SystemLog: FC = () => {
          <Grid item>
            <BlockFormControlLabel
              control={<Checkbox checked={data.compact} onChange={updateFormValue} name="compact" />}
-              label={LL.COMPACT()}
+              label="Compact"
            />
          </Grid>
          <Grid item>
            <Button startIcon={<DownloadIcon />} variant="outlined" color="secondary" onClick={onDownload}>
-              {LL.EXPORT()}
+              Export
            </Button>
          </Grid>
        </Grid>
@@ -272,7 +273,7 @@ const SystemLog: FC = () => {
  };

  return (
-    <SectionContent title={LL.LOG_OF(LL.SYSTEM(2))} titleGutter id="log-window">
+    <SectionContent title="System Log" titleGutter id="log-window">
      {content()}
    </SectionContent>
  );
--- a/interface/src/framework/system/SystemStatusForm.tsx
+++ b/interface/src/framework/system/SystemStatusForm.tsx
@@ -22,7 +22,6 @@ import ShowChartIcon from '@mui/icons-material/ShowChart';
 import MemoryIcon from '@mui/icons-material/Memory';
 import AppsIcon from '@mui/icons-material/Apps';
 import SdStorageIcon from '@mui/icons-material/SdStorage';
-import SdCardAlertIcon from '@mui/icons-material/SdCardAlert';
 import FolderIcon from '@mui/icons-material/Folder';
 import RefreshIcon from '@mui/icons-material/Refresh';
 import PowerSettingsNewIcon from '@mui/icons-material/PowerSettingsNew';
@@ -32,16 +31,13 @@ import TimerIcon from '@mui/icons-material/Timer';
 import CancelIcon from '@mui/icons-material/Cancel';

 import { ButtonRow, FormLoader, SectionContent, MessageBox } from '../../components';
-import { SystemStatus, Version } from '../../types';
+import { EspPlatform, SystemStatus, Version } from '../../types';
 import * as SystemApi from '../../api/system';
 import { extractErrorMessage, useRest } from '../../utils';

 import { AuthenticatedContext } from '../../contexts/authentication';

 import axios from 'axios';
-import RestartMonitor from './RestartMonitor';
-
-import { useI18nContext } from '../../i18n/i18n-react';

 export const VERSIONCHECK_ENDPOINT = 'https://api.github.com/repos/emsesp/EMS-ESP32/releases/latest';
 export const VERSIONCHECK_DEV_ENDPOINT = 'https://api.github.com/repos/emsesp/EMS-ESP32/releases/tags/latest';
@@ -52,9 +48,6 @@ function formatNumber(num: number) {
 }

 const SystemStatusForm: FC = () => {
-  const { LL } = useI18nContext();
-  const [restarting, setRestarting] = useState<boolean>();
-
  const { loadData, data, errorMessage } = useRest<SystemStatus>({ read: SystemApi.readSystemStatus });

  const { me } = useContext(AuthenticatedContext);
@@ -71,7 +64,7 @@ const SystemStatusForm: FC = () => {
      setLatestVersion({
        version: response.data.name,
        url: response.data.assets[1].browser_download_url,
-        changelog: response.data.assets[0].browser_download_url
+        changelog: response.data.html_url
      });
    });
    axios.get(VERSIONCHECK_DEV_ENDPOINT).then((response) => {
@@ -86,25 +79,10 @@ const SystemStatusForm: FC = () => {
  const restart = async () => {
    setProcessing(true);
    try {
-      const response = await SystemApi.restart();
-      if (response.status === 200) {
-        setRestarting(true);
-      }
-    } catch (error) {
-      enqueueSnackbar(extractErrorMessage(error, LL.PROBLEM_LOADING()), { variant: 'error' });
-    } finally {
-      setConfirmRestart(false);
-      setProcessing(false);
-    }
-  };
-
-  const partition = async () => {
-    setProcessing(true);
-    try {
-      await SystemApi.partition();
-      setRestarting(true);
-    } catch (error) {
-      enqueueSnackbar(extractErrorMessage(error, LL.PROBLEM_LOADING()), { variant: 'error' });
+      await SystemApi.restart();
+      enqueueSnackbar('EMS-ESP is restarting...', { variant: 'info' });
+    } catch (error: unknown) {
+      enqueueSnackbar(extractErrorMessage(error, 'Problem restarting device'), { variant: 'error' });
    } finally {
      setConfirmRestart(false);
      setProcessing(false);
@@ -113,17 +91,16 @@ const SystemStatusForm: FC = () => {

  const renderRestartDialog = () => (
    <Dialog open={confirmRestart} onClose={() => setConfirmRestart(false)}>
-      <DialogTitle>{LL.RESTART()}</DialogTitle>
-      <DialogContent dividers>{LL.RESTART_CONFIRM()}</DialogContent>
+      <DialogTitle>Restart</DialogTitle>
+      <DialogContent dividers>Are you sure you want to restart EMS-ESP?</DialogContent>
      <DialogActions>
        <Button
          startIcon={<CancelIcon />}
          variant="outlined"
          onClick={() => setConfirmRestart(false)}
-          disabled={processing}
          color="secondary"
        >
-          {LL.CANCEL()}
+          Cancel
        </Button>
        <Button
          startIcon={<PowerSettingsNewIcon />}
@@ -133,19 +110,8 @@ const SystemStatusForm: FC = () => {
          color="primary"
          autoFocus
        >
-          {LL.RESTART()}
+          Restart
        </Button>
-        {data?.has_loader && (
-          <Button
-            startIcon={<PowerSettingsNewIcon />}
-            variant="outlined"
-            onClick={partition}
-            disabled={processing}
-            color="primary"
-          >
-            EMS-ESP-Loader
-          </Button>
-        )}
      </DialogActions>
    </Dialog>
  );
@@ -153,19 +119,22 @@ const SystemStatusForm: FC = () => {
  const renderVersionDialog = () => {
    return (
      <Dialog open={showingVersion} onClose={() => setShowingVersion(false)}>
-        <DialogTitle>{LL.VERSION_CHECK(1)}</DialogTitle>
+        <DialogTitle>Version Check</DialogTitle>
        <DialogContent dividers>
-          <MessageBox my={0} level="info" message={LL.SYSTEM_VERSION_RUNNING() + ' ' + data?.emsesp_version} />
+          <MessageBox
+            my={0}
+            level="info"
+            message={'You are currently running EMS-ESP version ' + data?.emsesp_version}
+          />
          {latestVersion && (
            <Box mt={2} mb={2}>
-              {LL.THE_LATEST()}&nbsp;<u>{LL.OFFICIAL()}</u>&nbsp;{LL.VERSION_IS()}&nbsp;<b>{latestVersion.version}</b>
-              &nbsp;(
+              The latest <u>official</u> version is <b>{latestVersion.version}</b>&nbsp;(
              <Link target="_blank" href={latestVersion.changelog} color="primary">
-                {LL.RELEASE_NOTES()}
+                {'release notes'}
              </Link>
              )&nbsp;(
              <Link target="_blank" href={latestVersion.url} color="primary">
-                {LL.DOWNLOAD(1)}
+                {'download'}
              </Link>
              )
            </Box>
@@ -173,15 +142,14 @@ const SystemStatusForm: FC = () => {

          {latestDevVersion && (
            <Box mt={2} mb={2}>
-              {LL.THE_LATEST()}&nbsp;<u>{LL.DEVELOPMENT()}</u>&nbsp;{LL.VERSION_IS()}&nbsp;
-              <b>{latestDevVersion.version}</b>
+              The latest <u>development</u> version is&nbsp;<b>{latestDevVersion.version}</b>
              &nbsp;(
              <Link target="_blank" href={latestDevVersion.changelog} color="primary">
-                {LL.RELEASE_NOTES()}
+                {'release notes'}
              </Link>
              )&nbsp;(
              <Link target="_blank" href={latestDevVersion.url} color="primary">
-                {LL.DOWNLOAD(1)}
+                {'download'}
              </Link>
              )
            </Box>
@@ -189,17 +157,17 @@ const SystemStatusForm: FC = () => {

          <Box color="warning.main" p={0} pl={0} pr={0} mt={4} mb={0}>
            <Typography variant="body2">
-              {LL.USE()}&nbsp;
-              <Link href={uploadURL} color="primary">
-                {LL.UPLOAD()}
+              Use&nbsp;
+              <Link target="_blank" href={uploadURL} color="primary">
+                {'UPLOAD'}
              </Link>
-              &nbsp;{LL.SYSTEM_APPLY_FIRMWARE()}
+              &nbsp;to apply the new firmware
            </Typography>
          </Box>
        </DialogContent>
        <DialogActions>
          <Button variant="outlined" onClick={() => setShowingVersion(false)} color="secondary">
-            {LL.CLOSE()}
+            Close
          </Button>
        </DialogActions>
      </Dialog>
@@ -210,9 +178,9 @@ const SystemStatusForm: FC = () => {
    setProcessing(true);
    try {
      await SystemApi.factoryReset();
-      setRestarting(true);
-    } catch (error) {
-      enqueueSnackbar(extractErrorMessage(error, LL.PROBLEM_UPDATING()), { variant: 'error' });
+      enqueueSnackbar('Device has been factory reset and will now restart', { variant: 'info' });
+    } catch (error: unknown) {
+      enqueueSnackbar(extractErrorMessage(error, 'Problem factory resetting the device'), { variant: 'error' });
    } finally {
      setConfirmFactoryReset(false);
      setProcessing(false);
@@ -221,17 +189,16 @@ const SystemStatusForm: FC = () => {

  const renderFactoryResetDialog = () => (
    <Dialog open={confirmFactoryReset} onClose={() => setConfirmFactoryReset(false)}>
-      <DialogTitle>{LL.FACTORY_RESET()}</DialogTitle>
-      <DialogContent dividers>{LL.SYSTEM_FACTORY_TEXT_DIALOG()}</DialogContent>
+      <DialogTitle>Factory Reset</DialogTitle>
+      <DialogContent dividers>Are you sure you want to reset the device to its factory defaults?</DialogContent>
      <DialogActions>
        <Button
          startIcon={<CancelIcon />}
          variant="outlined"
          onClick={() => setConfirmFactoryReset(false)}
-          disabled={processing}
          color="secondary"
        >
-          {LL.CANCEL()}
+          Cancel
        </Button>
        <Button
          startIcon={<SettingsBackupRestoreIcon />}
@@ -241,7 +208,7 @@ const SystemStatusForm: FC = () => {
          autoFocus
          color="error"
        >
-          {LL.FACTORY_RESET()}
+          Factory Reset
        </Button>
      </DialogActions>
    </Dialog>
@@ -261,10 +228,10 @@ const SystemStatusForm: FC = () => {
                <BuildIcon />
              </Avatar>
            </ListItemAvatar>
-            <ListItemText primary={LL.EMS_ESP_VER()} secondary={'v' + data.emsesp_version} />
+            <ListItemText primary="EMS-ESP Version" secondary={'v' + data.emsesp_version} />
            {latestVersion && (
              <Button color="primary" onClick={() => setShowingVersion(true)}>
-                {LL.VERSION_CHECK(0)}
+                Version Check
              </Button>
            )}
          </ListItem>
@@ -275,7 +242,7 @@ const SystemStatusForm: FC = () => {
                <DevicesIcon />
              </Avatar>
            </ListItemAvatar>
-            <ListItemText primary={LL.PLATFORM()} secondary={data.esp_platform + ' / ' + data.sdk_version} />
+            <ListItemText primary="Device (Platform / SDK)" secondary={data.esp_platform + ' / ' + data.sdk_version} />
          </ListItem>
          <Divider variant="inset" component="li" />
          <ListItem>
@@ -284,7 +251,7 @@ const SystemStatusForm: FC = () => {
                <TimerIcon />
              </Avatar>
            </ListItemAvatar>
-            <ListItemText primary={LL.UPTIME()} secondary={data.uptime} />
+            <ListItemText primary="System Uptime" secondary={data.uptime} />
          </ListItem>
          <Divider variant="inset" component="li" />
          <ListItem>
@@ -293,7 +260,7 @@ const SystemStatusForm: FC = () => {
                <ShowChartIcon />
              </Avatar>
            </ListItemAvatar>
-            <ListItemText primary={LL.CPU_FREQ()} secondary={data.cpu_freq_mhz + ' MHz'} />
+            <ListItemText primary="CPU Frequency" secondary={data.cpu_freq_mhz + ' MHz'} />
          </ListItem>
          <Divider variant="inset" component="li" />
          <ListItem>
@@ -303,11 +270,17 @@ const SystemStatusForm: FC = () => {
              </Avatar>
            </ListItemAvatar>
            <ListItemText
-              primary={LL.HEAP()}
-              secondary={formatNumber(data.free_heap) + ' KB / ' + formatNumber(data.max_alloc_heap) + ' KB '}
+              primary="Heap (Free / Max Alloc)"
+              secondary={
+                formatNumber(data.free_heap) +
+                ' / ' +
+                formatNumber(data.max_alloc_heap) +
+                ' bytes ' +
+                (data.esp_platform === EspPlatform.ESP8266 ? '(' + data.heap_fragmentation + '% fragmentation)' : '')
+              }
            />
          </ListItem>
-          {data.psram_size !== undefined && data.free_psram !== undefined && (
+          {data.esp_platform === EspPlatform.ESP32 && data.psram_size > 0 && (
            <>
              <Divider variant="inset" component="li" />
              <ListItem>
@@ -317,8 +290,8 @@ const SystemStatusForm: FC = () => {
                  </Avatar>
                </ListItemAvatar>
                <ListItemText
-                  primary={LL.PSRAM()}
-                  secondary={formatNumber(data.psram_size) + ' KB / ' + formatNumber(data.free_psram) + ' KB'}
+                  primary="PSRAM (Size / Free)"
+                  secondary={formatNumber(data.psram_size) + ' / ' + formatNumber(data.free_psram) + ' bytes'}
                />
              </ListItem>
            </>
@@ -331,25 +304,13 @@ const SystemStatusForm: FC = () => {
              </Avatar>
            </ListItemAvatar>
            <ListItemText
-              primary={LL.FLASH()}
+              primary="Flash Chip (Size / Speed)"
              secondary={
-                formatNumber(data.flash_chip_size) + ' KB / ' + (data.flash_chip_speed / 1000000).toFixed(0) + ' MHz'
+                formatNumber(data.flash_chip_size) + ' bytes / ' + (data.flash_chip_speed / 1000000).toFixed(0) + ' MHz'
              }
            />
          </ListItem>
          <Divider variant="inset" component="li" />
-          <ListItem>
-            <ListItemAvatar>
-              <Avatar>
-                <SdCardAlertIcon />
-              </Avatar>
-            </ListItemAvatar>
-            <ListItemText
-              primary={LL.APPSIZE()}
-              secondary={formatNumber(data.app_used) + ' KB / ' + formatNumber(data.app_free) + ' KB'}
-            />
-          </ListItem>
-          <Divider variant="inset" component="li" />
          <ListItem>
            <ListItemAvatar>
              <Avatar>
@@ -357,8 +318,15 @@ const SystemStatusForm: FC = () => {
              </Avatar>
            </ListItemAvatar>
            <ListItemText
-              primary={LL.FILESYSTEM()}
-              secondary={formatNumber(data.fs_used) + ' KB / ' + formatNumber(data.fs_free) + ' KB'}
+              primary="File System (Used / Total)"
+              secondary={
+                formatNumber(data.fs_used) +
+                ' / ' +
+                formatNumber(data.fs_total) +
+                ' bytes (' +
+                formatNumber(data.fs_total - data.fs_used) +
+                '\xa0bytes free)'
+              }
            />
          </ListItem>
          <Divider variant="inset" component="li" />
@@ -367,7 +335,7 @@ const SystemStatusForm: FC = () => {
          <Box flexGrow={1} sx={{ '& button': { mt: 2 } }}>
            <ButtonRow>
              <Button startIcon={<RefreshIcon />} variant="outlined" color="secondary" onClick={loadData}>
-                {LL.REFRESH()}
+                Refresh
              </Button>
            </ButtonRow>
          </Box>
@@ -380,7 +348,7 @@ const SystemStatusForm: FC = () => {
                  color="primary"
                  onClick={() => setConfirmRestart(true)}
                >
-                  {LL.RESTART()}
+                  Restart
                </Button>
                <Button
                  startIcon={<SettingsBackupRestoreIcon />}
@@ -388,7 +356,7 @@ const SystemStatusForm: FC = () => {
                  onClick={() => setConfirmFactoryReset(true)}
                  color="error"
                >
-                  {LL.FACTORY_RESET()}
+                  Factory reset
                </Button>
              </ButtonRow>
            </Box>
@@ -402,8 +370,8 @@ const SystemStatusForm: FC = () => {
  };

  return (
-    <SectionContent title={LL.STATUS_OF(LL.SYSTEM(1))} titleGutter>
-      {restarting ? <RestartMonitor /> : content()}
+    <SectionContent title="System Status" titleGutter>
+      {content()}
    </SectionContent>
  );
 };
--- a/interface/src/framework/system/UploadFileForm.tsx
+++ b/interface/src/framework/system/UploadFileForm.tsx
@@ -7,23 +7,17 @@ import { FileUploadConfig } from '../../api/endpoints';
 import GeneralFileUpload from './GeneralFileUpload';
 import RestartMonitor from './RestartMonitor';

-import { useI18nContext } from '../../i18n/i18n-react';
-
 const UploadFileForm: FC = () => {
  const [restarting, setRestarting] = useState<boolean>();

-  const { LL } = useI18nContext();
-
  const uploadFile = useRef(async (file: File, config?: FileUploadConfig) => {
    const response = await SystemApi.uploadFile(file, config);
-    if (response.status === 200) {
-      setRestarting(true);
-    }
+    setRestarting(true);
    return response;
  });

  return (
-    <SectionContent title={LL.UPLOAD_DOWNLOAD()} titleGutter>
+    <SectionContent title="Upload File" titleGutter>
      {restarting ? <RestartMonitor /> : <GeneralFileUpload uploadGeneralFile={uploadFile.current} />}
    </SectionContent>
  );
--- a/interface/src/i18n/DE.svg
+++ b/interface/src/i18n/DE.svg
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 85.333 512 341.333"><path fill="#D80027" d="M0 85.331h512v341.337H0z"/><path d="M0 85.331h512v113.775H0z"/><path fill="#FFDA44" d="M0 312.882h512v113.775H0z"/></svg>
--- a/interface/src/i18n/FR.svg
+++ b/interface/src/i18n/FR.svg
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 85.333 512 341.333"><path fill="#FFF" d="M0 85.331h512v341.337H0z"/><path fill="#0052B4" d="M0 85.331h170.663v341.337H0z"/><path fill="#D80027" d="M341.337 85.331H512v341.337H341.337z"/></svg>
--- a/interface/src/i18n/GB.svg
+++ b/interface/src/i18n/GB.svg
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 85.333 512 341.333"><path fill="#FFF" d="M0 85.333h512V426.67H0z"/><path fill="#D80027" d="M288 85.33h-64v138.666H0v64h224v138.666h64V287.996h224v-64H288z"/><g fill="#0052B4"><path d="M393.785 315.358 512 381.034v-65.676zM311.652 315.358 512 426.662v-31.474l-143.693-79.83zM458.634 426.662l-146.982-81.664v81.664z"/></g><path fill="#FFF" d="M311.652 315.358 512 426.662v-31.474l-143.693-79.83z"/><path fill="#D80027" d="M311.652 315.358 512 426.662v-31.474l-143.693-79.83z"/><g fill="#0052B4"><path d="M90.341 315.356 0 365.546v-50.19zM200.348 329.51v97.151H25.491z"/></g><path fill="#D80027" d="M143.693 315.358 0 395.188v31.474l200.348-111.304z"/><g fill="#0052B4"><path d="M118.215 196.634 0 130.958v65.676zM200.348 196.634 0 85.33v31.474l143.693 79.83zM53.366 85.33l146.982 81.664V85.33z"/></g><path fill="#FFF" d="M200.348 196.634 0 85.33v31.474l143.693 79.83z"/><path fill="#D80027" d="M200.348 196.634 0 85.33v31.474l143.693 79.83z"/><g fill="#0052B4"><path d="M421.659 196.636 512 146.446v50.19zM311.652 182.482V85.331h174.857z"/></g><path fill="#D80027" d="M368.307 196.634 512 116.804V85.33L311.652 196.634z"/></svg>
--- a/interface/src/i18n/NL.svg
+++ b/interface/src/i18n/NL.svg
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 85.5 513 342"><path fill="#FFF" d="M0 85.5h513v342H0z"/><path fill="#cd1f2a" d="M0 85.5h513v114H0z"/><path fill="#1d4185" d="M0 312h513v114H0z"/></svg>
--- a/interface/src/i18n/NO.svg
+++ b/interface/src/i18n/NO.svg
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 85.333 512 341.333"><path fill="#D80027" d="M0 85.334h512v341.337H0z"/><path fill="#FFF" d="M512 295.883H202.195v130.783H122.435V295.883H0V216.111h122.435V85.329H202.195v130.782H512V277.329z"/><path fill="#2E52B2" d="M512 234.666v42.663H183.652v149.337h-42.674V277.329H0v-42.663h140.978V85.329h42.674v149.337z"/></svg>
--- a/interface/src/i18n/PL.svg
+++ b/interface/src/i18n/PL.svg
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 85.333 512 341.333"><g fill="#FFF"><path d="M0 85.337h512v341.326H0z"/><path d="M0 85.337h512V256H0z"/></g><path fill="#D80027" d="M0 256h512v170.663H0z"/></svg>
--- a/interface/src/i18n/SV.svg
+++ b/interface/src/i18n/SV.svg
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 85.333 512 341.333"><path fill="#0052B4" d="M0 85.333h512V426.67H0z"/><path fill="#FFDA44" d="M192 85.33h-64v138.666H0v64h128v138.666h64V287.996h320v-64H192z"/></svg>
--- a/interface/src/i18n/de/index.ts
+++ b/interface/src/i18n/de/index.ts
@@ -1,310 +0,0 @@
-import type { Translation } from '../i18n-types';
-/* prettier-ignore */
-/* eslint-disable */
-
-const de: Translation = {
-  LANGUAGE: 'Sprache',
-  RETRY: 'Neuer Versuch',
-  LOADING: 'Laden',
-  IS_REQUIRED: '{0} ist erforderlich',
-  SIGN_IN: 'Einloggen',
-  SIGN_OUT: 'Ausloggen',
-  USERNAME: 'Nutzername',
-  PASSWORD: 'Passwort',
-  SU_PASSWORD: 'su Passwort',
-  DASHBOARD: 'Kontrollzentrum',
-  SETTINGS_OF: '{0} Einstellungen',
-  SAVED: 'gespeichert',
-  HELP_OF: '{0} Hilfe',
-  LOGGED_IN: 'Eingeloggt als {name}',
-  PLEASE_SIGNIN: 'Bitte einloggen, um fortzufahren',
-  UPLOAD_SUCCESSFUL: 'Hochladen erfolgreich',
-  DOWNLOAD_SUCCESSFUL: 'Herunterladen erfolgreich',
-  INVALID_LOGIN: 'Ungültige Login Daten',
-  NETWORK: 'Netzwerk',
-  SECURITY: 'Sicherheit',
-  ONOFF_CAP: 'AN/AUS',
-  ONOFF: 'an/aus',
-  TYPE: 'Typ',
-  DESCRIPTION: 'Bezeichnung',
-  ENTITIES: 'Entitäten',
-  REFRESH: 'Aktualisieren',
-  EXPORT: 'Exportieren',
-  DEVICE_DETAILS: 'Geräte Details',
-  BRAND: 'Marke',
-  ID_OF: '{0} ID',
-  DEVICE: 'Geräte',
-  PRODUCT: 'Produkt',
-  VERSION: 'Version',
-  ENTITY_NAME: 'Entitätsname',
-  VALUE: '{{Wert|wert}}',
-  SHOW_FAV: 'nur Favoriten anzeigen',
-  DEVICE_SENSOR_DATA: 'Geräte- und Sensordaten',
-  DEVICES_SENSORS: 'Geräte & Sensoren',
-  ATTACHED_SENSORS: 'Angeschlossene EMS-ESP Sensoren',
-  RUN_COMMAND: 'Befehl ausführen',
-  CHANGE_VALUE: 'Wert ändern',
-  CANCEL: 'Abbrechen',
-  RESET: 'Zurücksetzen',
-  SEND: 'Senden',
-  SAVE: 'Speichern',
-  REMOVE: 'Entfernen',
-  PROBLEM_UPDATING: 'Problem beim Aktualisieren',
-  PROBLEM_LOADING: 'Problem beim Laden',
-  ACCESS_DENIED: 'Zugriff abgelehnt',
-  ANALOG_SENSOR: 'Analogsensor',
-  ANALOG_SENSORS: 'Analogsensoren',
-  UPDATED_OF: '{0} Aktualisiert',
-  UPDATE_OF: '{0} Aktualisieren',
-  REMOVED_OF: '{0} Entfernt',
-  DELETION_OF: '{0} Löschung',
-  OFFSET: 'Addition',
-  FACTOR: 'Faktor',
-  FREQ: 'Frequenz',
-  DUTY_CYCLE: 'Duty Cycle',
-  UNIT: 'UoM',
-  STARTVALUE: 'Startwert',
-  WARN_GPIO: 'Warnung: Vorsicht bei der korrekten Wahl des GPIO!',
-  EDIT: 'Editiere',
-  SENSOR: 'Sensor',
-  TEMP_SENSOR: 'Temperatursensor',
-  TEMP_SENSORS: 'Temperatursensoren',
-  WRITE_CMD_SENT: 'Befehl schreiben wurde gesendet',
-  WRITE_CMD_FAILED: 'Befehl schreiben failed', // TODO translate
-  EMS_BUS_WARNING: 'EMS-Bus getrennt. Wenn diese Warnung nach einigen Sekunden immer noch besteht, überprüfen Sie bitte die Einstellungen und das Board-Profil',
-  EMS_BUS_SCANNING: 'Suche nach EMS Geräten...',
-  CONNECTED: 'Verbunden',
-  TX_ISSUES: 'Tx-Probleme - versuchen Sie einen anderen Tx-Modus',
-  DISCONNECTED: 'Getrennt',
-  EMS_SCAN: 'Möchten Sie wirklich eine vollständige Gerätesuche des EMS-Busses starten?',
-  EMS_BUS_STATUS: 'EMS-Busstatus',
-  ACTIVE_DEVICES: 'Aktive Geräte und Sensoren',
-  EMS_DEVICE: 'EMS Gerät',
-  SUCCESS: 'ERFOLG',
-  FAIL: 'FEHLER',
-  QUALITY: 'QUALITÄT',
-  SCAN_DEVICES: 'Nach neuen Geräten suchen',
-  EMS_BUS_STATUS_TITLE: 'EMS-Bus- und Aktivitätsstatus',
-  SCAN: 'Suche',
-  STATUS_NAMES: [
-    'EMS-Telegramme empfangen (Rx)',
-    'EMS-Telegramme gelesen (Tx)',
-    'EMS-Telegramme geschrieben (Tx)',
-    'Temperatursensoren gelesen',
-    'Analogsensoren gelesen',
-    'MQTT-Nachrichten gesendet',
-    'API-Aufrufe',
-    'Syslog-Mitteilungen'
-  ],
-  NUM_DEVICES: '{num} Gerät{{e}}',
-  NUM_TEMP_SENSORS: '{num} Temperatursensor{{en}}',
-  NUM_ANALOG_SENSORS: '{num} Analogsensor{{en}}',
-  NUM_DAYS: '{num} Tag{{e}}',
-  NUM_SECONDS: '{num} Sekunde{{n}}',
-  NUM_HOURS: '{num} Stunde{{n}}',
-  NUM_MINUTES: '{num} Minute{{n}}',
-  APPLICATION_SETTINGS: 'Anwendungseinstellungen',
-  CUSTOMIZATION: 'Anpassungen',
-  APPLICATION_RESTARTING: 'EMS-ESP startet neu',
-  INTERFACE_BOARD_PROFILE: 'Interface Platinenprofil',
-  BOARD_PROFILE_TEXT: 'Wählen Sie ein vorkonfiguriertes Platinenprofil aus der Liste unten aus oder wählen Sie "Custom", um Ihre eigenen Hardwareeinstellungen zu konfigurieren',
-  BOARD_PROFILE: 'Platinenprofil',
-  CUSTOM: 'Custom',
-  GPIO_OF: '{0} GPIO',
-  BUTTON: 'Taste',
-  TEMPERATURE: 'Temperatur',
-  PHY_TYPE: 'Eth PHY Typ',
-  DISABLED: 'deaktiviert',
-  TX_MODE: 'Tx Modus',
-  HARDWARE: 'Hardware',
-  EMS_BUS: '{{BUS|EMS BUS}}',
-  GENERAL_OPTIONS: 'Allgemeine Optionen',
-  LANGUAGE_ENTITIES: 'Sprache (für Geräteentitäten)',
-  HIDE_LED: 'LED ausblenden',
-  ENABLE_TELNET: 'Aktiviere Telnet Konsole',
-  ENABLE_ANALOG: 'Aktiviere Analogsensoren',
-  CONVERT_FAHRENHEIT: 'Konvertiere Temperaturwerte in Fahrenheit',
-  BYPASS_TOKEN: 'Zugriffstoken-Autorisierung bei API-Aufrufen umgehen',
-  READONLY: 'Nur-Lese-Modus aktivieren (blockiert alle ausgehenden EMS Tx Write-Befehle)',
-  UNDERCLOCK_CPU: 'CPU-Geschwindigkeit untertakten',
-  HEATINGOFF: 'Boiler Start mit Heizung ausgeschaltet',
-  ENABLE_SHOWER_TIMER: 'Duschtimer aktivieren',
-  ENABLE_SHOWER_ALERT: 'Duschalarm aktivieren',
-  TRIGGER_TIME: 'Auslösezeit',
-  COLD_SHOT_DURATION: 'Kaltschussdauer',
-  FORMATTING_OPTIONS: 'Formatierungsoptionen',
-  BOOLEAN_FORMAT_DASHBOARD: 'Boolsches Format für Web',
-  BOOLEAN_FORMAT_API: 'Boolesches Format API/MQTT',
-  ENUM_FORMAT: 'Enum Format API/MQTT',
-  INDEX: 'Index',
-  ENABLE_PARASITE: 'Parasitäre Stomversorgung',
-  LOGGING: 'Protokollierung',
-  LOG_HEX: 'EMS-Telegramme hexadezimal protokollieren',
-  ENABLE_SYSLOG: 'Syslog aktivieren',
-  LOG_LEVEL: 'Log Level',
-  MARK_INTERVAL: 'Intervallmarke',
-  SECONDS: 'Sekunden',
-  MINUTES: 'Minuten',
-  HOURS: 'Stunden',
-  RESTART: 'Neu starten',
-  RESTART_TEXT: 'EMS-ESP muss neu gestartet werden, um geänderte Systemeinstellungen zu übernehmen',
-  RESTART_CONFIRM: 'EMS-ESP wirklich neu starten?',
-  COMMAND: 'Befehl',
-  CUSTOMIZATIONS_RESTART: 'Alle Anpassungen wurden entfernt. Neustart...',
-  CUSTOMIZATIONS_FULL: 'Ausgewählte Entitäten haben das Limit überschritten. Bitte stapelweise speichern',
-  CUSTOMIZATIONS_SAVED: 'Anpassungen gespeichert',
-  CUSTOMIZATIONS_HELP_1: 'Wählen Sie ein Gerät aus und passen Sie die Entitäten mithilfe der Optionen an',
-  CUSTOMIZATIONS_HELP_2: 'als Favorit markieren',
-  CUSTOMIZATIONS_HELP_3: 'Schreibaktion deaktivieren',
-  CUSTOMIZATIONS_HELP_4: 'von MQTT und API ausschließen',
-  CUSTOMIZATIONS_HELP_5: 'Aus dem Kontrollzentrum ausblenden',
-  CUSTOMIZATIONS_HELP_6: 'Aus dem Speicher löschen',
-  SELECT_DEVICE: 'Wählen Sie ein Gerät aus',
-  SET_ALL: 'setzen Sie alle',
-  OPTIONS: 'Optionen',
-  NAME: 'Name',
-  CUSTOMIZATIONS_RESET: 'Möchten Sie wirklich alle Anpassungen entfernen, einschließlich der benutzerdefinierten Einstellungen der Temperatur- und Analogsensoren?',
-  DEVICE_ENTITIES: 'Geräteentitäten',
-  USER_CUSTOMIZATION: 'Benutzeranpassung',
-  SUPPORT_INFORMATION: 'Unterstützende Informationen',
-  CLICK_HERE: 'Hier klicken',
-  HELP_INFORMATION_1: 'EMS-ESP Konfigurationsanweisungen und mehr finden Sie im Online-Wiki',
-  HELP_INFORMATION_2: 'Für einen Live-Community-Chat besuchen Sie unseren Discord-Server',
-  HELP_INFORMATION_3: 'Um neue Funktionen anzufragen oder Fehler zu melden, eröffnen Sie ein Issue auf Github',
-  HELP_INFORMATION_4: 'Bitte laden Sie die System-Details und hängen Sie sie an das Support-Issue an. ',
-  HELP_INFORMATION_5: 'EMS-ESP ist ein freies Open-Source Projekt. Bitte unterstützen Sie die zukünftige Entwicklung mit einem "Star" auf Github!',
-  SUPPORT_INFO: 'Support Info',
-  UPLOAD_OF: '{0} Hochladen',
-  UPLOAD: 'Hochladen',
-  DOWNLOAD: 'Herunterladen',
-  ABORTED: 'abgebrochen',
-  FAILED: 'gescheitert',
-  SUCCESSFUL: 'erfolgreich',
-  SYSTEM: 'System',
-  LOG_OF: '{0} Log',
-  STATUS_OF: '{0} Status',
-  UPLOAD_DOWNLOAD: 'Hoch-/Herunterladen',
-  SYSTEM_VERSION_RUNNING: 'Sie verwenden die Version',
-  SYSTEM_APPLY_FIRMWARE: 'um die neue Firmware anzuwenden',
-  CLOSE: 'Schließen',
-  USE: 'Verwenden Sie',
-  FACTORY_RESET: 'Werkseinstellung',
-  SYSTEM_FACTORY_TEXT: 'EMS-ESP wurde auf Werkseinstellung gesetzt und startet als Zugangspunkt neu',
-  SYSTEM_FACTORY_TEXT_DIALOG: 'Sind Sie sicher alle Einstellungen auf Werkseinstellung zu setzen?',
-  VERSION_CHECK: 'Versionsprüfung',
-  THE_LATEST: 'Die neueste',
-  OFFICIAL: 'offizielle',
-  DEVELOPMENT: 'Entwicklungs',
-  VERSION_IS: 'Version ist',
-  RELEASE_NOTES: 'Versionshinweise',
-  EMS_ESP_VER: 'EMS-ESP Version',
-  PLATFORM: 'Platform (Platform / SDK)',
-  UPTIME: 'System Betriebszeit',
-  CPU_FREQ: 'CPU Frequenz',
-  HEAP: 'freier RAM Speicher (Gesamt / max. Block)',
-  PSRAM: 'PSRAM (Größe / Frei)',
-  FLASH: 'Flash Speicher (Größe / Geschwindigkeit)',
-  APPSIZE: 'Programm (Genutzt / Frei)',
-  FILESYSTEM: 'Dateisystem (Genutzt / Frei)',
-  BUFFER_SIZE: 'max. Puffergröße',
-  COMPACT: 'Kompakte Darstellung',
-  ENABLE_OTA: 'OTA Updates verwenden',
-  DOWNLOAD_CUSTOMIZATION_TEXT: 'Herunterladen der individuellen Entitätsanpassungen',
-  DOWNLOAD_SETTINGS_TEXT: 'Herunterladen der Anwendungseinstellungen. Vorsicht beim Teilen der Einstellungen, da sie Passwörter und andere sensitive Einstellungen enthalten',
-  UPLOAD_TEXT: 'Hochladen von neuer Firmware (.bin), Geräte- oder Entitätseinstellungen (.json), zur optionalen Validitätsprüfung zuerst die (.md5) Datei hochladen',
-  UPLOADING: 'Hochladen',
-  UPLOAD_DROP_TEXT: 'Klicken Sie hier, oder ziehen eine Datei hierher',
-  ERROR: 'Unerwarteter Fehler, bitter versuchen Sie es erneut',
-  TIME_SET: 'Zeit gesetzt',
-  MANAGE_USERS: 'Nutzerverwaltung',
-  IS_ADMIN: 'ist Admin',
-  USER_WARNING: 'Sie müssen mindestens einen Admin-Nutzer konfigurieren',
-  ADD: 'Hinzufügen',
-  ACCESS_TOKEN_FOR: 'Zugangs-Token für',
-  ACCESS_TOKEN_TEXT: 'Dieses Token ist für REST API Aufrufe bestimmt, die eine Authentifizierung benötigen. Es kann entweder als Bearer Token im `Authorization-Header` oder in der Access_Token URL verwendet werden.',
-  GENERATING_TOKEN: 'Erzeuge Token',
-  USER: 'Nutzer',
-  MODIFY: 'Ändern',
-  SU_TEXT: 'Das su (super user) Passwort wird zum Signieren der Authentifikations-Tokens verwendet und ermöglicht Admin-Berechtigung in der Konsole.',
-  NOT_ENABLED: 'Nicht aktiviert',
-  ERRORS_OF: '{0} Fehler',
-  DISCONNECT_REASON: 'Grund der Verbindungsunterbrechung',
-  ENABLE_MQTT: 'MQTT aktivieren',
-  BROKER: 'Broker',
-  CLIENT: 'Client',
-  BASE_TOPIC: 'Base',
-  OPTIONAL: 'Optional',
-  FORMATTING: 'Formattierung',
-  MQTT_FORMAT: 'Topic/Payload Format',
-  MQTT_NEST_1: 'Eingebettet in einem Gesamttopic',
-  MQTT_NEST_2: 'Als einzelne Topics',
-  MQTT_RESPONSE: 'Veröffentliche die Kommandoantwort als `response` Topic',
-  MQTT_PUBLISH_TEXT_1: 'Veröffentliche einzelne Werte bei Veränderung als eigene Topics',
-  MQTT_PUBLISH_TEXT_2: 'Veröffentliche als Kommando-Topic (ioBroker)',
-  MQTT_PUBLISH_TEXT_3: 'Aktiviere `MQTT Discovery` (Home Assistant, Domoticz)',
-  MQTT_PUBLISH_TEXT_4: 'Prefix für die `Discovery`-Topics',
-  MQTT_PUBLISH_INTERVALS: 'Veröffentlichungs-Intervalle',
-  MQTT_INT_BOILER: 'Boiler und Wärmepumpen',
-  MQTT_INT_THERMOSTATS: 'Thermostate',
-  MQTT_INT_SOLAR: 'Solarmodule',
-  MQTT_INT_MIXER: 'Mischermodule',
-  MQTT_INT_HEARTBEAT: 'Heartbeat',
-  MQTT_QUEUE: 'MQTT Queue',
-  DEFAULT: 'Standard',
-  MQTT_ENTITY_FORMAT: 'Entitäts-ID Format',
-  MQTT_ENTITY_FORMAT_0: 'Einzelinstanz, Langname (v3.4)',
-  MQTT_ENTITY_FORMAT_1: 'Einzelinstanz, MQTT-Namen',
-  MQTT_ENTITY_FORMAT_2: 'Mehrfachinstanzen, MQTT-Namen',
-  MQTT_CLEAN_SESSION: 'Setze `Clean Session`',
-  MQTT_RETAIN_FLAG: 'Setze `Retain flag` immer',
-  INACTIVE: 'Inaktiv',
-  ACTIVE: 'Aktiv',
-  UNKNOWN: 'Unbekannt',
-  SET_TIME: 'Zeiteinstellung',
-  SET_TIME_TEXT: 'Geben Sie das lokale Datum und die Zeit ein',
-  LOCAL_TIME: 'Lokalzeit',
-  UTC_TIME: 'UTC Zeit',
-  ENABLE_NTP: 'Aktiviere NTP',
-  NTP_SERVER: 'NTP Server',
-  TIME_ZONE: 'Zeitzone',
-  ACCESS_POINT: 'Zugangspunkt',
-  AP_PROVIDE: 'Aktiviere Zugangspunkt',
-  AP_PROVIDE_TEXT_1: 'Immer',
-  AP_PROVIDE_TEXT_2: 'Wenn WiFi nicht verbunden',
-  AP_PROVIDE_TEXT_3: 'Niemals',
-  AP_PREFERRED_CHANNEL: 'Bevorzugter Kanal',
-  AP_HIDE_SSID: 'Verstecke SSID',
-  AP_CLIENTS: 'AP-Klienten',
-  AP_MAX_CLIENTS: 'Max Anzahl AP-Klienten',
-  AP_LOCAL_IP: 'Lokale IP',
-  NETWORK_SCAN: 'Suche nach WiFi Netzwerken',
-  IDLE: 'Leerlauf',
-  LOST: 'Verloren',
-  SCANNING: 'Suche',
-  SCAN_AGAIN: 'Erneute Suche',
-  NETWORK_SCANNER: 'Netzwerk Suche',
-  NETWORK_NO_WIFI: 'Keine WiFi Netzwerke gefunden',
-  NETWORK_BLANK_SSID: 'Freilassen um WiFi zu deaktivieren',
-  TX_POWER: 'Tx Leistung',
-  HOSTNAME: 'Hostname',
-  NETWORK_DISABLE_SLEEP: 'Deaktiviere WiFi Schlafmodus',
-  NETWORK_LOW_BAND: 'Verwende niedrige WiFi Bandbreite',
-  NETWORK_USE_DNS: 'Aktiviere mDNS Service',
-  NETWORK_ENABLE_CORS: 'Aktiviere CORS',
-  NETWORK_CORS_ORIGIN: 'CORS origin',
-  NETWORK_ENABLE_IPV6: 'Aktiviere IPv6 Unterstützung',
-  NETWORK_FIXED_IP: 'Feste IP Adresse',
-  NETWORK_GATEWAY: 'Gateway',
-  NETWORK_SUBNET: 'Subnetz Maske',
-  NETWORK_DNS: 'DNS Server',
-  ADDRESS_OF: '{0} Adresse',
-  ADMIN: 'Administrator',
-  GUEST: 'Gast',
-  NEW: 'Neuer',
-  NEW_NAME_OF: 'Ändere {0}',
-  ENTITY: 'Entität',
-  MIN: 'min',
-  MAX: 'max'
-};
-
-export default de;
--- a/interface/src/i18n/en/index.ts
+++ b/interface/src/i18n/en/index.ts
@@ -1,310 +0,0 @@
-import type { Translation } from '../i18n-types';
-/* prettier-ignore */
-/* eslint-disable */
-
-const en: Translation = {
-  LANGUAGE: 'Language',
-  RETRY: 'Retry',
-  LOADING: 'Loading',
-  IS_REQUIRED: '{0} is required',
-  SIGN_IN: 'Sign In',
-  SIGN_OUT: 'Sign Out',
-  USERNAME: 'Username',
-  PASSWORD: 'Password',
-  SU_PASSWORD: 'su Password',
-  DASHBOARD: 'Dashboard',
-  SETTINGS_OF: '{0} Settings',
-  SAVED: 'saved',
-  HELP_OF: '{0} Help',
-  LOGGED_IN: 'Logged in as {name}',
-  PLEASE_SIGNIN: 'Please sign in to continue',
-  UPLOAD_SUCCESSFUL: 'Upload finished',
-  DOWNLOAD_SUCCESSFUL: 'Download finished',
-  INVALID_LOGIN: 'Invalid login details',
-  NETWORK: 'Network',
-  SECURITY: 'Security',
-  ONOFF_CAP: 'ON/OFF',
-  ONOFF: 'on/off',
-  TYPE: 'Type',
-  DESCRIPTION: 'Description',
-  ENTITIES: 'Entities',
-  REFRESH: 'Refresh',
-  EXPORT: 'Export',
-  DEVICE_DETAILS: 'Device Details',
-  ID_OF: '{0} ID',
-  DEVICE: 'Device',
-  PRODUCT: 'Product',
-  VERSION: 'Version',
-  BRAND: 'Brand',
-  ENTITY_NAME: 'Entity Name',
-  VALUE: '{{Value|value}}',
-  SHOW_FAV: 'only show favorites',
-  DEVICE_SENSOR_DATA: 'Device and Sensor Data',
-  DEVICES_SENSORS: 'Devices & Sensors',
-  ATTACHED_SENSORS: 'Attached EMS-ESP Sensors',
-  RUN_COMMAND: 'Call Command',
-  CHANGE_VALUE: 'Change Value',
-  CANCEL: 'Cancel',
-  RESET: 'Reset',
-  SEND: 'Send',
-  SAVE: 'Save',
-  REMOVE: 'Remove',
-  PROBLEM_UPDATING: 'Problem updating',
-  PROBLEM_LOADING: 'Problem loading',
-  ACCESS_DENIED: 'Access Denied',
-  ANALOG_SENSOR: 'Analog Sensor',
-  ANALOG_SENSORS: 'Analog Sensors',
-  UPDATED_OF: '{0} Updated',
-  UPDATE_OF: '{0} Update',
-  REMOVED_OF: '{0} Removed',
-  DELETION_OF: '{0} Deletion',
-  OFFSET: 'Offset',
-  FACTOR: 'Factor',
-  FREQ: 'Frequency',
-  DUTY_CYCLE: 'Duty Cycle',
-  UNIT: 'UoM',
-  STARTVALUE: 'Start value',
-  WARN_GPIO: 'Warning: be careful when assigning a GPIO!',
-  EDIT: 'Edit',
-  SENSOR: 'Sensor',
-  TEMP_SENSOR: 'Temperature Sensor',
-  TEMP_SENSORS: 'Temperature Sensors',
-  WRITE_CMD_SENT: 'Write command has been sent',
-  WRITE_CMD_FAILED: 'Write command failed',
-  EMS_BUS_WARNING: 'EMS bus disconnected. If this warning still persists after a few seconds please check settings and board profile',
-  EMS_BUS_SCANNING: 'Scanning for EMS devices...',
-  CONNECTED: 'Connected',
-  TX_ISSUES: 'Tx issues - try a different Tx Mode',
-  DISCONNECTED: 'Disconnected',
-  EMS_SCAN: 'Are you sure you want to initiate a full device scan of the EMS bus?',
-  EMS_BUS_STATUS: 'EMS Bus Status',
-  ACTIVE_DEVICES: 'Active Devices & Sensors',
-  EMS_DEVICE: 'EMS Device',
-  SUCCESS: 'SUCCESS',
-  FAIL: 'FAIL',
-  QUALITY: 'QUALITY',
-  SCAN_DEVICES: 'Scan for new devices',
-  EMS_BUS_STATUS_TITLE: 'EMS Bus & Activity Status',
-  SCAN: 'Scan',
-  STATUS_NAMES: [
-    'EMS Telegrams Received (Rx)',
-    'EMS Reads (Tx)',
-    'EMS Writes (Tx)',
-    'Temperature Sensor Reads',
-    'Analog Sensor Reads',
-    'MQTT Publishes',
-    'API Calls',
-    'Syslog Messages'
-  ],
-  NUM_DEVICES: '{num} Device{{s}}',
-  NUM_TEMP_SENSORS: '{num} Temperature Sensor{{s}}',
-  NUM_ANALOG_SENSORS: '{num} Analog Sensor{{s}}',
-  NUM_DAYS: '{num} day{{s}}',
-  NUM_SECONDS: '{num} second{{s}}',
-  NUM_HOURS: '{num} hour{{s}}',
-  NUM_MINUTES: '{num} minute{{s}}',
-  APPLICATION_SETTINGS: 'Application Settings',
-  CUSTOMIZATION: 'Customization',
-  APPLICATION_RESTARTING: 'EMS-ESP is restarting',
-  INTERFACE_BOARD_PROFILE: 'Interface Board Profile',
-  BOARD_PROFILE_TEXT: 'Select a pre-configured interface board profile from the list below or choose Custom to configure your own hardware settings',
-  BOARD_PROFILE: 'Board Profile',
-  CUSTOM: 'Custom',
-  GPIO_OF: '{0} GPIO',
-  BUTTON: 'Button',
-  TEMPERATURE: 'Temperature',
-  PHY_TYPE: 'Eth PHY Type',
-  DISABLED: 'disabled',
-  TX_MODE: 'Tx Mode',
-  HARDWARE: 'Hardware',
-  EMS_BUS: '{{BUS|EMS BUS}}',
-  GENERAL_OPTIONS: 'General Options',
-  LANGUAGE_ENTITIES: 'Language (for device entities)',
-  HIDE_LED: 'Hide LED',
-  ENABLE_TELNET: 'Enable Telnet Console',
-  ENABLE_ANALOG: 'Enable Analog Sensors',
-  CONVERT_FAHRENHEIT: 'Convert temperature values to Fahrenheit',
-  BYPASS_TOKEN: 'Bypass Access Token authorization on API calls',
-  READONLY: 'Enable read-only mode (blocks all outgoing EMS Tx Write commands)',
-  UNDERCLOCK_CPU: 'Underclock CPU speed',
-  HEATINGOFF: 'Start boiler with forced heating off',
-  ENABLE_SHOWER_TIMER: 'Enable Shower Timer',
-  ENABLE_SHOWER_ALERT: 'Enable Shower Alert',
-  TRIGGER_TIME: 'Trigger Time',
-  COLD_SHOT_DURATION: 'Cold Shot Duration',
-  FORMATTING_OPTIONS: 'Formatting Options',
-  BOOLEAN_FORMAT_DASHBOARD: 'Boolean Format Dashboard',
-  BOOLEAN_FORMAT_API: 'Boolean Format API/MQTT',
-  ENUM_FORMAT: 'Enum Format API/MQTT',
-  INDEX: 'Index',
-  ENABLE_PARASITE: 'Enable parasite power',
-  LOGGING: 'Logging',
-  LOG_HEX: 'Log EMS telegrams in hexadecimal',
-  ENABLE_SYSLOG: 'Enable Syslog',
-  LOG_LEVEL: 'Log Level',
-  MARK_INTERVAL: 'Mark Interval',
-  SECONDS: 'seconds',
-  MINUTES: 'minutes',
-  HOURS: 'hours',
-  RESTART: 'Restart',
-  RESTART_TEXT: 'EMS-ESP needs to be restarted to apply changed system settings',
-  RESTART_CONFIRM: 'Are you sure you want to restart EMS-ESP?',
-  COMMAND: 'Command',
-  CUSTOMIZATIONS_RESTART: 'All customizations have been removed. Restarting...',
-  CUSTOMIZATIONS_FULL: 'Selected entities exceeded limit. Please save in batches',
-  CUSTOMIZATIONS_SAVED: 'Customizations saved',
-  CUSTOMIZATIONS_HELP_1: 'Select a device and customize the entities options or click to rename',
-  CUSTOMIZATIONS_HELP_2: 'mark as favorite',
-  CUSTOMIZATIONS_HELP_3: 'disable write action',
-  CUSTOMIZATIONS_HELP_4: 'exclude from MQTT and API',
-  CUSTOMIZATIONS_HELP_5: 'hide from Dashboard',
-  CUSTOMIZATIONS_HELP_6: 'remove from memory',
-  SELECT_DEVICE: 'Select a device',
-  SET_ALL: 'set all',
-  OPTIONS: 'Options',
-  NAME: 'Name',
-  CUSTOMIZATIONS_RESET: 'Are you sure you want remove all customizations including the custom settings of the Temperature and Analog sensors?',
-  DEVICE_ENTITIES: 'Device Entities',
-  USER_CUSTOMIZATION: 'User Customization',
-  SUPPORT_INFORMATION: 'Support Information',
-  CLICK_HERE: 'Click Here',
-  HELP_INFORMATION_1: 'Visit the online wiki to get instructions on how to configure EMS-ESP',
-  HELP_INFORMATION_2: 'For live community chat join our Discord server',
-  HELP_INFORMATION_3: 'To request a feature or report a bug',
-  HELP_INFORMATION_4: 'remember to download and attach your system information for a faster response when reporting an issue',
-  HELP_INFORMATION_5: 'EMS-ESP is a free and open-source project. Please support its future development by giving it a star on Github!',
-  SUPPORT_INFO: 'Support Info',
-  UPLOAD_OF: '{0} Upload',
-  UPLOAD: 'Upload',
-  DOWNLOAD: 'Download',
-  ABORTED: 'aborted',
-  FAILED: 'failed',
-  SUCCESSFUL: 'successful',
-  SYSTEM: 'System',
-  LOG_OF: '{0} Log',
-  STATUS_OF: '{0} Status',
-  UPLOAD_DOWNLOAD: 'Upload/Download',
-  SYSTEM_VERSION_RUNNING: 'You are currently running version',
-  SYSTEM_APPLY_FIRMWARE: 'to apply the new firmware',
-  CLOSE: 'Close',
-  USE: 'Use',
-  FACTORY_RESET: 'Factory Reset',
-  SYSTEM_FACTORY_TEXT: 'Device has been factory reset and will now restart',
-  SYSTEM_FACTORY_TEXT_DIALOG: 'Are you sure you want to reset the device to its factory defaults?',
-  VERSION_CHECK: 'Version Check',
-  THE_LATEST: 'The latest',
-  OFFICIAL: 'official',
-  DEVELOPMENT: 'development',
-  VERSION_IS: 'version is',
-  RELEASE_NOTES: 'release notes',
-  EMS_ESP_VER: 'EMS-ESP Version',
-  PLATFORM: 'Device (Platform / SDK)',
-  UPTIME: 'System Uptime',
-  CPU_FREQ: 'CPU Frequency',
-  HEAP: 'Heap (Free / Max Alloc)',
-  PSRAM: 'PSRAM (Size / Free)',
-  FLASH: 'Flash Chip (Size / Speed)',
-  APPSIZE: 'Application (Used / Free)',
-  FILESYSTEM: 'File System (Used / Free)',
-  BUFFER_SIZE: 'Max Buffer Size',
-  COMPACT: 'Compact',
-  ENABLE_OTA: 'Enable OTA Updates',
-  DOWNLOAD_CUSTOMIZATION_TEXT: 'Download the entity customizations',
-  DOWNLOAD_SETTINGS_TEXT: 'Download the application settings. Be careful when sharing your settings as this file contains passwords and other sensitive system information',
-  UPLOAD_TEXT: 'Upload a new firmware (.bin) file, settings or customizations (.json) file below, for optional validation upload (.md5) first',
-  UPLOADING: 'Uploading',
-  UPLOAD_DROP_TEXT: 'Drop file or click here',
-  ERROR: 'Unexpected Error, please try again',
-  TIME_SET: 'Time set',
-  MANAGE_USERS: 'Manage Users',
-  IS_ADMIN: 'is Admin',
-  USER_WARNING: 'You must have at least one admin user configured',
-  ADD: 'Add',
-  ACCESS_TOKEN_FOR: 'Access Token for',
-  ACCESS_TOKEN_TEXT: 'The token below is used with REST API calls that require authorization. It can be passed either as a Bearer token in the Authorization header or in the access_token URL query parameter.',
-  GENERATING_TOKEN: 'Generating token',
-  USER: 'User',
-  MODIFY: 'Modify',
-  SU_TEXT: 'The su (super user) password is used to sign authentication tokens and also enable admin privileges within the Console.',
-  NOT_ENABLED: 'Not enabled',
-  ERRORS_OF: '{0} Errors',
-  DISCONNECT_REASON: 'Disconnect Reason',
-  ENABLE_MQTT: 'Enable MQTT',
-  BROKER: 'Broker',
-  CLIENT: 'Client',
-  BASE_TOPIC: 'Base',
-  OPTIONAL: 'Optional',
-  FORMATTING: 'Formatting',
-  MQTT_FORMAT: 'Topic/Payload Format',
-  MQTT_NEST_1: 'Nested in a single topic',
-  MQTT_NEST_2: 'As individual topics',
-  MQTT_RESPONSE: 'Publish command output to a `response` topic',
-  MQTT_PUBLISH_TEXT_1: 'Publish single value topics on change',
-  MQTT_PUBLISH_TEXT_2: 'Publish to command topics (ioBroker)',
-  MQTT_PUBLISH_TEXT_3: 'Enable MQTT Discovery (Home Assistant, Domoticz)',
-  MQTT_PUBLISH_TEXT_4: 'Prefix for the Discovery topics',
-  MQTT_PUBLISH_INTERVALS: 'Publish Intervals',
-  MQTT_INT_BOILER: 'Boilers and Heat Pumps',
-  MQTT_INT_THERMOSTATS: 'Thermostats',
-  MQTT_INT_SOLAR: 'Solar Modules',
-  MQTT_INT_MIXER: 'Mixer Modules',
-  MQTT_INT_HEARTBEAT: 'Heartbeat',
-  MQTT_QUEUE: 'MQTT Queue',
-  DEFAULT: 'Default',
-  MQTT_ENTITY_FORMAT: 'Entity ID format',
-  MQTT_ENTITY_FORMAT_0: 'Single instance, long name (v3.4)',
-  MQTT_ENTITY_FORMAT_1: 'Single instance, short name',
-  MQTT_ENTITY_FORMAT_2: 'Multiple instances, short name',
-  MQTT_CLEAN_SESSION: 'Set Clean Session',
-  MQTT_RETAIN_FLAG: 'Always set Retain flag',
-  INACTIVE: 'Inactive',
-  ACTIVE: 'Active',
-  UNKNOWN: 'Unknown',
-  SET_TIME: 'Set Time',
-  SET_TIME_TEXT: 'Enter local date and time below to set the time',
-  LOCAL_TIME: 'Local Time',
-  UTC_TIME: 'UTC Time',
-  ENABLE_NTP: 'Enable NTP',
-  NTP_SERVER: 'NTP Server',
-  TIME_ZONE: 'Time Zone',
-  ACCESS_POINT: 'Access Point',
-  AP_PROVIDE: 'Enable Access Point',
-  AP_PROVIDE_TEXT_1: 'always',
-  AP_PROVIDE_TEXT_2: 'when WiFi is disconnected',
-  AP_PROVIDE_TEXT_3: 'never',
-  AP_PREFERRED_CHANNEL: 'Preferred Channel',
-  AP_HIDE_SSID: 'Hide SSID',
-  AP_CLIENTS: 'AP Clients',
-  AP_MAX_CLIENTS: 'Max Clients',
-  AP_LOCAL_IP: 'Local IP',
-  NETWORK_SCAN: 'Scan WiFi Networks',
-  IDLE: 'Idle',
-  LOST: 'Lost',
-  SCANNING: 'Scanning',
-  SCAN_AGAIN: 'Scan again',
-  NETWORK_SCANNER: 'Network Scanner',
-  NETWORK_NO_WIFI: 'No WiFi networks found',
-  NETWORK_BLANK_SSID: 'leave blank to disable WiFi',
-  TX_POWER: 'Tx Power',
-  HOSTNAME: 'Hostname',
-  NETWORK_DISABLE_SLEEP: 'Disable WiFi Sleep Mode',
-  NETWORK_LOW_BAND: 'Use Lower WiFi Bandwidth',
-  NETWORK_USE_DNS: 'Enable mDNS Service',
-  NETWORK_ENABLE_CORS: 'Enable CORS',
-  NETWORK_CORS_ORIGIN: 'CORS origin',
-  NETWORK_ENABLE_IPV6: 'Enable IPv6 support',
-  NETWORK_FIXED_IP: 'Use Fixed IP address',
-  NETWORK_GATEWAY: 'Gateway',
-  NETWORK_SUBNET: 'Subnet Mask',
-  NETWORK_DNS: 'DNS Servers',
-  ADDRESS_OF: '{0} Address',
-  ADMIN: 'Admin',
-  GUEST: 'Guest',
-  NEW: 'New',
-  NEW_NAME_OF: 'New {0} name',
-  ENTITY: 'entity',
-  MIN: 'min',
-  MAX: 'max'
-};
-
-export default en;
--- a/interface/src/i18n/formatters.ts
+++ b/interface/src/i18n/formatters.ts
@@ -1,10 +0,0 @@
-import type { FormattersInitializer } from 'typesafe-i18n';
-import type { Locales, Formatters } from './i18n-types';
-
-export const initFormatters: FormattersInitializer<Locales, Formatters> = (locale: Locales) => {
-  const formatters: Formatters = {
-    // add your formatter functions here
-  };
-
-  return formatters;
-};
--- a/interface/src/i18n/fr/index.ts
+++ b/interface/src/i18n/fr/index.ts
@@ -1,310 +0,0 @@
-import type { Translation } from '../i18n-types';
-/* prettier-ignore */
-/* eslint-disable */
-
-const fr: Translation = {
-  LANGUAGE: 'Langue',
-  RETRY: 'Réessayer',
-  LOADING: 'Chargement',
-  IS_REQUIRED: '{0} est requis',
-  SIGN_IN: 'Se connecter',
-  SIGN_OUT: 'Se déconnecter',
-  USERNAME: 'Nom d\'utilisateur',
-  PASSWORD: 'Mot de passe',
-  SU_PASSWORD: 'Mot de passe su',
-  DASHBOARD: 'Tableau de bord',
-  SETTINGS_OF: 'Paramètres {0}',
-  SAVED: 'sauvegardé',
-  HELP_OF: 'Aide {0}',
-  LOGGED_IN: 'Connecté en tant que {name}',
-  PLEASE_SIGNIN: 'Veuillez vous connecter pour continuer',
-  UPLOAD_SUCCESSFUL: 'Upload terminée',
-  DOWNLOAD_SUCCESSFUL: 'Téléchargement terminé',
-  INVALID_LOGIN: 'Informations de connexion invalides',
-  NETWORK: 'Réseau',
-  SECURITY: 'Sécurité',
-  ONOFF_CAP: 'ON/OFF',
-  ONOFF: 'on/off',
-  TYPE: 'Type',
-  DESCRIPTION: 'Description',
-  ENTITIES: 'Entités',
-  REFRESH: 'Rafraîchir',
-  EXPORT: 'Exporter',
-  DEVICE_DETAILS: 'Détails de l\'appareil',
-  ID_OF: 'ID {0}',
-  DEVICE: 'Appareil',
-  PRODUCT: 'Produit',
-  VERSION: 'Version',
-  BRAND: 'Marque',
-  ENTITY_NAME: 'Nom de l\'entité',
-  VALUE: 'Valeur',
-  SHOW_FAV: 'ne montrer que les favoris',
-  DEVICE_SENSOR_DATA: 'Données des appareils et capteurs',
-  DEVICES_SENSORS: 'Appareils et capteurs',
-  ATTACHED_SENSORS: 'Capteurs EMS-ESP connectés',
-  RUN_COMMAND: 'Lancer une commande',
-  CHANGE_VALUE: 'Changer la valeur',
-  CANCEL: 'Annuler',
-  RESET: 'Réinitialiser',
-  SEND: 'Envoyer',
-  SAVE: 'Sauvegarder',
-  REMOVE: 'Enlever',
-  PROBLEM_UPDATING: 'Problème lors de la mise à jour',
-  PROBLEM_LOADING: 'Problème lors du chargement',
-  ACCESS_DENIED: 'Accès refusé',
-  ANALOG_SENSOR: 'Capteur analogique',
-  ANALOG_SENSORS: 'Capteurs analogiques',
-  UPDATED_OF: '{0} mis à jour',
-  UPDATE_OF: 'Mise à jour de {0}',
-  REMOVED_OF: '{0} enlevé',
-  DELETION_OF: '{0} supprimé',
-  OFFSET: 'Offset',
-  FACTOR: 'Facteur',
-  FREQ: 'Fréquence',
-  DUTY_CYCLE: 'Cycle de fonctionnement',
-  UNIT: 'Unité',
-  STARTVALUE: 'Valeur de départ',
-  WARN_GPIO: 'Attention: soyez vigilant en choisissant un GPIO!',
-  EDIT: 'Éditer',
-  SENSOR: 'Capteur',
-  TEMP_SENSOR: 'Capteur de température',
-  TEMP_SENSORS: 'Capteurs de température',
-  WRITE_CMD_SENT: 'Envoyer la commande sent', // TODO translate
-  WRITE_CMD_FAILED: 'Envoyer la commande failed', // TODO translate
-  EMS_BUS_WARNING: 'Bus EMS déconnecté. Si ce message persiste après quelques secondes, vérifiez les paramètres et la configuration de la carte.',
-  EMS_BUS_SCANNING: 'Scan des appareils EMS...',
-  CONNECTED: 'Connecté',
-  TX_ISSUES: 'Problèmes de transmission (Tx) - Essayez un autre mode Tx',
-  DISCONNECTED: 'Déconnecté',
-  EMS_SCAN: 'Etes-vous sûr de vouloir lancer un scan complet du bus EMS ?',
-  EMS_BUS_STATUS: 'Statut du bus EMS',
-  ACTIVE_DEVICES: 'Appareils et capteurs actifs',
-  EMS_DEVICE: 'Appareils EMS',
-  SUCCESS: 'SUCCÈS',
-  FAIL: 'ÉCHEC',
-  QUALITY: 'QUALITÉ',
-  SCAN_DEVICES: 'Rechercher de nouveaux appareils',
-  EMS_BUS_STATUS_TITLE: 'Statut du bus et de l\'activité EMS',
-  SCAN: 'Scan',
-  STATUS_NAMES: [
-    'Télégrammes EMS reçus (Rx)',
-    'Lectures EMS (Tx)',
-    'Écritures EMS (Tx)',
-    'Lectures capteurs de température',
-    'Lectures capteurs analogiques',
-    'Publications MQTT',
-    'Appels à l\'API',
-    'Messages Syslog'
-  ],
-  NUM_DEVICES: '{num} Appareil{{s}}',
-  NUM_TEMP_SENSORS: '{num} Capteur{{s}} de température',
-  NUM_ANALOG_SENSORS: '{num} Capteur{{s}} analogique{{s}}',
-  NUM_DAYS: '{num} jour{{s}}',
-  NUM_SECONDS: '{num} seconde{{s}}',
-  NUM_HOURS: '{num} heure{{s}}',
-  NUM_MINUTES: '{num} minute{{s}}',
-  APPLICATION_SETTINGS: 'Paramètres de l\'application',
-  CUSTOMIZATION: 'Personnalisation',
-  APPLICATION_RESTARTING: 'EMS-ESP redémarre',
-  INTERFACE_BOARD_PROFILE: 'Profile de carte d\'interface',
-  BOARD_PROFILE_TEXT: 'Sélectionnez un profil de carte d\'interface préconfiguré dans la liste ci-dessous ou choisissez Personnalisé pour configurer vos propres paramètres matériels',
-  BOARD_PROFILE: 'Profil de carte',
-  CUSTOM: 'Personnalisé',
-  GPIO_OF: 'GPIO {0}',
-  BUTTON: 'Bouton',
-  TEMPERATURE: 'Température',
-  PHY_TYPE: 'Eth PHY Type',
-  DISABLED: 'désactivé',
-  TX_MODE: 'Tx Mode',
-  HARDWARE: 'Hardware',
-  EMS_BUS: '{{BUS|EMS BUS}}',
-  GENERAL_OPTIONS: 'Options générales',
-  LANGUAGE_ENTITIES: 'Langue (pour les entités du matériel)',
-  HIDE_LED: 'Cacher la LED',
-  ENABLE_TELNET: 'Activer la console Telnet',
-  ENABLE_ANALOG: 'Activer les capteurs analogiques',
-  CONVERT_FAHRENHEIT: 'Convertir les températures en Fahrenheit',
-  BYPASS_TOKEN: 'Contourner l\'autorisation du jeton d\'accès sur les appels API',
-  READONLY: 'Activer le mode lecture uniquement (bloque toutes les commandes EMS sortantes en écriture Tx)',
-  UNDERCLOCK_CPU: 'Underclock du CPU',
-  HEATINGOFF: 'Start boiler with forced heating off',
-  ENABLE_SHOWER_TIMER: 'Activer la minuterie de la douche',
-  ENABLE_SHOWER_ALERT: 'Activer les alertes de durée de douche',
-  TRIGGER_TIME: 'Durée avant déclenchement',
-  COLD_SHOT_DURATION: 'Durée du coup d\'eau froide',
-  FORMATTING_OPTIONS: 'Options de mise en forme',
-  BOOLEAN_FORMAT_DASHBOARD: 'Tableau de bord du format booléen',
-  BOOLEAN_FORMAT_API: 'Format booléen API/MQTT',
-  ENUM_FORMAT: 'Format enum API/MQTT',
-  INDEX: 'Index',
-  ENABLE_PARASITE: 'Activer la puissance parasite',
-  LOGGING: 'Journal',
-  LOG_HEX: 'Enregistrer les télégrammes EMS en hexadécimal',
-  ENABLE_SYSLOG: 'Activer les logs système',
-  LOG_LEVEL: 'Niveau de log',
-  MARK_INTERVAL: 'Intervalle de marquage',
-  SECONDS: 'secondes',
-  MINUTES: 'minutes',
-  HOURS: 'heures',
-  RESTART: 'Redémarrer',
-  RESTART_TEXT: 'EMS-ESP a besoin de redémarrer pour appliquer les changements de paramètres du système',
-  RESTART_CONFIRM: 'Etes-vous sûr de vouloir redémarrer EMS-ESP ?',
-  COMMAND: 'Commande',
-  CUSTOMIZATIONS_RESTART: 'Toutes les personnalisations ont été supprimées. Redémarrage...',
-  CUSTOMIZATIONS_FULL: 'Les entités sélectionnées ont dépassé la limite. Veuillez sauvegarder par lots',
-  CUSTOMIZATIONS_SAVED: 'Personnalisations enregistrées',
-  CUSTOMIZATIONS_HELP_1: 'Sélectionnez un appareil et personnalisez les options des entités ou cliquez pour renommer',
-  CUSTOMIZATIONS_HELP_2: 'marquer comme favori',
-  CUSTOMIZATIONS_HELP_3: 'désactiver l\'action d\'écriture',
-  CUSTOMIZATIONS_HELP_4: 'exclure de MQTT et de l\'API',
-  CUSTOMIZATIONS_HELP_5: 'cacher du Tableau de bord',
-  CUSTOMIZATIONS_HELP_6: 'remove from memory',
-  SELECT_DEVICE: 'Sélectionnez un appareil',
-  SET_ALL: 'tout régler',
-  OPTIONS: 'Options',
-  NAME: 'Nom',
-  CUSTOMIZATIONS_RESET: 'Êtes-vous sûr de vouloir supprimer toutes les personnalisations, y compris les paramètres personnalisés des capteurs de température et analogiques ?',
-  DEVICE_ENTITIES: 'Entités de l\'appareil',
-  USER_CUSTOMIZATION: 'Personnalisation de l\'utilisateur',
-  SUPPORT_INFORMATION: 'Information de support',
-  CLICK_HERE: 'Cliquez ici',
-  HELP_INFORMATION_1: 'Visitez le wiki en ligne pour obtenir des instructions sur la façon de configurer EMS-ESP.',
-  HELP_INFORMATION_2: 'Pour une discussion en direct avec la communauté, rejoignez notre serveur Discord',
-  HELP_INFORMATION_3: 'Pour demander une fonctionnalité ou signaler un problème',
-  HELP_INFORMATION_4: 'n\'oubliez pas de télécharger et de joindre les informations relatives à votre système pour obtenir une réponse plus rapide lorsque vous signalez un problème',
-  HELP_INFORMATION_5: 'EMS-ESP est un projet libre et open-source. Merci de soutenir son développement futur en lui donnant une étoile sur Github !',
-  SUPPORT_INFO: 'Information de support',
-  UPLOAD_OF: 'Upload de {0}',
-  UPLOAD: 'Upload',
-  DOWNLOAD: 'Download',
-  ABORTED: 'annulé',
-  FAILED: 'échoué',
-  SUCCESSFUL: 'réussi',
-  SYSTEM: 'Système',
-  LOG_OF: '{0} Log',
-  STATUS_OF: 'Statut {0}',
-  UPLOAD_DOWNLOAD: 'Upload/Download',
-  SYSTEM_VERSION_RUNNING: 'Vous utilisez actuellement la version',
-  SYSTEM_APPLY_FIRMWARE: 'pour appliquer le nouveau firmware',
-  CLOSE: 'Fermer',
-  USE: 'Utiliser',
-  FACTORY_RESET: 'Réinitialisation',
-  SYSTEM_FACTORY_TEXT: 'L\'appareil a été réinitialisé et va maintenant redémarrer',
-  SYSTEM_FACTORY_TEXT_DIALOG: 'Êtes-vous sûr de vouloir réinitialiser l\'appareil à ses paramètres d\'usine ?',
-  VERSION_CHECK: 'Vérification de la version',
-  THE_LATEST: 'La dernière',
-  OFFICIAL: 'officielle',
-  DEVELOPMENT: 'développement',
-  VERSION_IS: 'version est',
-  RELEASE_NOTES: 'notes de version',
-  EMS_ESP_VER: 'Version EMS-ESP',
-  PLATFORM: 'Appareil (Plateforme / SDK)',
-  UPTIME: 'Durée de fonctionnement du système',
-  CPU_FREQ: 'Fréquence du CPU',
-  HEAP: 'Heap (Libre / Max Allouée)',
-  PSRAM: 'PSRAM (Taille / Libre)',
-  FLASH: 'Flash Chip (Taille / Vitesse)',
-  APPSIZE: 'Application (Utilisée / Libre)',
-  FILESYSTEM: 'File System (Utilisée / Libre)',
-  BUFFER_SIZE: 'Max taille du buffer',
-  COMPACT: 'Compact',
-  ENABLE_OTA: 'Activer les updates OTA',
-  DOWNLOAD_CUSTOMIZATION_TEXT: 'Télécharger les personnalisations d\'entités',
-  DOWNLOAD_SETTINGS_TEXT: 'Téléchargez les paramètres de l\'application. Soyez prudent lorsque vous partagez vos paramètres car ce fichier contient des mots de passe et d\'autres informations système sensibles.',
-  UPLOAD_TEXT: 'Téléchargez un nouveau fichier de firmware (.bin), un fichier de paramètres ou de personnalisations (.json) ci-dessous, pour une validation optionnelle téléchargez d\'abord un fichier (.md5)',
-  UPLOADING: 'Téléchargement',
-  UPLOAD_DROP_TEXT: 'Déposer le fichier ou cliquer ici',
-  ERROR: 'Erreur inattendue, veuillez réessayer',
-  TIME_SET: 'Time set',
-  MANAGE_USERS: 'Gérer les utilisateurs',
-  IS_ADMIN: 'admin',
-  USER_WARNING: 'Vous devez avoir au moins un utilisateur admin configuré',
-  ADD: 'Ajouter',
-  ACCESS_TOKEN_FOR: 'Jeton d\'accès pour',
-  ACCESS_TOKEN_TEXT: 'Le jeton ci-dessous est utilisé avec les appels d\'API REST qui nécessitent une autorisation. Il peut être passé soit en tant que jeton Bearer dans l\'en-tête Authorization, soit dans le paramètre de requête URL access_token.',
-  GENERATING_TOKEN: 'Génération de jeton',
-  USER: 'Utilisateur',
-  MODIFY: 'Modifier',
-  SU_TEXT: 'Le mot de passe su (super utilisateur) est utilisé pour signer les jetons d\'authentification et activer les privilèges d\'administrateur dans la console.',
-  NOT_ENABLED: 'Non activé',
-  ERRORS_OF: 'Erreurs {0}',
-  DISCONNECT_REASON: 'Raison de la déconnexion',
-  ENABLE_MQTT: 'Activer le MQTT',
-  BROKER: 'Broker',
-  CLIENT: 'Client',
-  BASE_TOPIC: 'Base',
-  OPTIONAL: 'Optionnel',
-  FORMATTING: 'Mise en forme',
-  MQTT_FORMAT: 'Format du Topic/Payload',
-  MQTT_NEST_1: 'Englobé dans un topic unique',
-  MQTT_NEST_2: 'En tant que topics individuels',
-  MQTT_RESPONSE: 'Publier le résultat des commandes dans un topic `response`',
-  MQTT_PUBLISH_TEXT_1: 'Publier des topics à valeur unique sur changement',
-  MQTT_PUBLISH_TEXT_2: 'Publier vers des topics de commande (ioBroker)',
-  MQTT_PUBLISH_TEXT_3: 'Activer la découverte MQTT (Home Assistant, Domoticz)',
-  MQTT_PUBLISH_TEXT_4: 'Préfixe pour les topics découverte',
-  MQTT_PUBLISH_INTERVALS: 'Intervalles de publication',
-  MQTT_INT_BOILER: 'Chaudières et pompes à chaleur',
-  MQTT_INT_THERMOSTATS: 'Thermostats',
-  MQTT_INT_SOLAR: 'Modules solaires',
-  MQTT_INT_MIXER: 'Modules mélangeurs',
-  MQTT_INT_HEARTBEAT: 'Battements',
-  MQTT_QUEUE: 'Queue MQTT',
-  DEFAULT: 'Défaut',
-  MQTT_ENTITY_FORMAT: 'Entity ID format', // TODO translate
-  MQTT_ENTITY_FORMAT_0: 'Single instance, long name (v3.4)',// TODO translate
-  MQTT_ENTITY_FORMAT_1: 'Single instance, short name', // TODO translate
-  MQTT_ENTITY_FORMAT_2: 'Multiple instances, short name', // TODO translate
-  MQTT_CLEAN_SESSION: 'Flag Clean Session',
-  MQTT_RETAIN_FLAG: 'Toujours activer le Retain Flag',
-  INACTIVE: 'Inactif',
-  ACTIVE: 'Actif',
-  UNKNOWN: 'Inconnu',
-  SET_TIME: 'Définir l\'heure',
-  SET_TIME_TEXT: 'Entrer la date et l\'heure locale ci-dessous pour régler l\'heure',
-  LOCAL_TIME: 'Heure locale',
-  UTC_TIME: 'Heure UTC',
-  ENABLE_NTP: 'Activer le NTP',
-  NTP_SERVER: 'Serveur NTP',
-  TIME_ZONE: 'Fuseau horaire',
-  ACCESS_POINT: 'Point d\'accès',
-  AP_PROVIDE: 'Activer le Point d\'Accès',
-  AP_PROVIDE_TEXT_1: 'toujours',
-  AP_PROVIDE_TEXT_2: 'quand le WiFi est déconnecté',
-  AP_PROVIDE_TEXT_3: 'jamais',
-  AP_PREFERRED_CHANNEL: 'Canal préféré',
-  AP_HIDE_SSID: 'Cacher le SSID',
-  AP_CLIENTS: 'AP Clients',
-  AP_MAX_CLIENTS: 'Max Clients',
-  AP_LOCAL_IP: 'IP locale',
-  NETWORK_SCAN: 'Scanner les réseaux WiFi',
-  IDLE: 'Inactif',
-  LOST: 'Perdu',
-  SCANNING: 'Scan en cours',
-  SCAN_AGAIN: 'Rescanner',
-  NETWORK_SCANNER: 'Scan réseau',
-  NETWORK_NO_WIFI: 'Pas de réseau WiFi trouvé',
-  NETWORK_BLANK_SSID: 'laisser vide pour désactiver le WiFi',
-  TX_POWER: 'Puissance Tx',
-  HOSTNAME: 'Nom d\'hôte',
-  NETWORK_DISABLE_SLEEP: 'Désactiver le mode veille du WiFi',
-  NETWORK_LOW_BAND: 'Utiliser une bande passante WiFi plus faible',
-  NETWORK_USE_DNS: 'Activer le service mDNS',
-  NETWORK_ENABLE_CORS: 'Activer CORS',
-  NETWORK_CORS_ORIGIN: 'Origine CORS',
-  NETWORK_ENABLE_IPV6: 'Activer le support de l\'IPv6',
-  NETWORK_FIXED_IP: 'Utiliser une adresse IP fixe',
-  NETWORK_GATEWAY: 'Passerelle',
-  NETWORK_SUBNET: 'Masque de sous-réseau',
-  NETWORK_DNS: 'Serveurs DNS',
-  ADDRESS_OF: 'Adresse de {0}',
-  ADMIN: 'Admin',
-  GUEST: 'Invité',
-  NEW: 'Nouveau',
-  NEW_NAME_OF: 'Nouveau nom de {0}',
-  ENTITY: 'entité',
-  MIN: 'min',
-  MAX: 'max'
-};
-
-export default fr;
--- a/interface/src/i18n/nl/index.ts
+++ b/interface/src/i18n/nl/index.ts
@@ -1,310 +0,0 @@
-import type { Translation } from '../i18n-types';
-/* prettier-ignore */
-/* eslint-disable */
-
-const nl: Translation = {
-  LANGUAGE: 'Taal',
-  RETRY: 'Opnieuw proberen',
-  LOADING: 'Laden',
-  IS_REQUIRED: '{0} is verplicht',
-  SIGN_IN: 'Inloggen',
-  SIGN_OUT: 'Uitloggen',
-  USERNAME: 'Gebruikersnaam',
-  PASSWORD: 'Wachtwoord',
-  SU_PASSWORD: 'su Wachtwoord',
-  DASHBOARD: 'Dashboard',
-  SETTINGS_OF: '{0} Instellingen',
-  SAVED: 'opgeslagen',
-  HELP_OF: '{0} Help',
-  LOGGED_IN: 'Ingelogd als {name}',
-  PLEASE_SIGNIN: 'Log in om verder te gaan',
-  UPLOAD_SUCCESSFUL: 'Upload successvol',
-  DOWNLOAD_SUCCESSFUL: 'Download successvol',
-  INVALID_LOGIN: 'Logingegevens fout',
-  NETWORK: 'Netwerk',
-  SECURITY: 'Beveiliging',
-  ONOFF_CAP: 'AAN/UIT',
-  ONOFF: 'aan/uit',
-  TYPE: 'Type',
-  DESCRIPTION: 'Beschrijving',
-  ENTITIES: 'Entiteiten',
-  REFRESH: 'Ververs',
-  EXPORT: 'Export',
-  DEVICE_DETAILS: 'Device Gegevens',
-  ID_OF: '{0} ID',
-  DEVICE: 'Apparaat',
-  PRODUCT: 'Product',
-  VERSION: 'Versie',
-  BRAND: 'Merk',
-  ENTITY_NAME: 'Entiteit',
-  VALUE: '{{Waarde|waarde}}',
-  SHOW_FAV: 'alleen favorieten weergeven',
-  DEVICE_SENSOR_DATA: 'Apparaat en Sensor data',
-  DEVICES_SENSORS: 'Apparaten & Sensoren',
-  ATTACHED_SENSORS: 'Aangesloten EMS-ESP sensoren',
-  RUN_COMMAND: 'Call commando',
-  CHANGE_VALUE: 'Wijzig waarde',
-  CANCEL: 'Annuleren',
-  RESET: 'Reset',
-  SEND: 'Verzenden',
-  SAVE: 'Opslaan',
-  REMOVE: 'Verwijderen',
-  PROBLEM_UPDATING: 'Probleem met updaten',
-  PROBLEM_LOADING: 'Probleem met laden',
-  ACCESS_DENIED: 'Toegang geweigerd',
-  ANALOG_SENSOR: 'Analoge sensor',
-  ANALOG_SENSORS: 'Analoge Sensoren',
-  UPDATED_OF: '{0} Bijgewerkt',
-  UPDATE_OF: '{0} Bijwerken',
-  REMOVED_OF: '{0} Verwijderd',
-  DELETION_OF: '{0} Verwijder',
-  OFFSET: 'Offset',
-  FACTOR: 'Factor',
-  FREQ: 'Frequentie',
-  DUTY_CYCLE: 'Duty Cycle',
-  UNIT: 'UoM',
-  STARTVALUE: 'Startwaarde',
-  WARN_GPIO: 'Waarschuwing: let op met het koppelen van de juiste GPIO pin!',
-  EDIT: 'Wijzigen',
-  SENSOR: 'Sensor',
-  TEMP_SENSOR: 'Temperatuur sensor',
-  TEMP_SENSORS: 'Temperatuur Sensoren',
-  WRITE_CMD_SENT: 'Schrijf commando sent', // TODO translate
-  WRITE_CMD_FAILED: 'Schrijf commando failed', // TODO translate
-  EMS_BUS_WARNING: 'EMS bus niet gevonden. Als deze waarschuwing blijft staan na een paar seconden dan loop de instellingen na en in het bijzonder het apparaat type profiel na.',
-  EMS_BUS_SCANNING: 'Scannen naar EMS apparaten...',
-  CONNECTED: 'Verbonden',
-  TX_ISSUES: 'Tx bus probleem. Probeer een andere Tx verzendmodus',
-  DISCONNECTED: 'Niet verbonden',
-  EMS_SCAN: 'Weet je zeker dat je een volledige EMS bus scan uit wilt voeren?',
-  EMS_BUS_STATUS: 'EMS busstatus',
-  ACTIVE_DEVICES: 'Actieve Apparaten & Sensoren',
-  EMS_DEVICE: 'EMS Apparaat',
-  SUCCESS: 'SUCCESS',
-  FAIL: 'MISLUKT',
-  QUALITY: 'QUALITEIT',
-  SCAN_DEVICES: 'Scannen naar nieuwe apparaten',
-  EMS_BUS_STATUS_TITLE: 'EMS Bus & Activiteitenstatus',
-  SCAN: 'Scan',
-  STATUS_NAMES: [
-    'EMS Telegrammen ontvangen (Rx)',
-    'EMS Leesopdrachten (Tx)',
-    'EMS Schrijfopdrachten (Tx)',
-    'Temperatuursensoren uitgelezen',
-    'Analoge sensoren uitgelezen',
-    'MQTT publicaties',
-    'API calls',
-    'Syslog berichten'
-  ],
-  NUM_DEVICES: '{num} Apparaat{{en}}',
-  NUM_TEMP_SENSORS: '{num} Temperatuursensor{{en}}',
-  NUM_ANALOG_SENSORS: '{num} Analoge sensor{{en}}',
-  NUM_DAYS: '{num} dag{{en}}',
-  NUM_SECONDS: '{num} second{{en}}',
-  NUM_HOURS: '{num} {{uur|uren}}',
-  NUM_MINUTES: '{num} {{minuut|minuten}}',
-  APPLICATION_SETTINGS: 'Applicatieinstellingen',
-  CUSTOMIZATION: 'Custom aanpassingen',
-  APPLICATION_RESTARTING: 'EMS-ESP herstarten',
-  INTERFACE_BOARD_PROFILE: 'Interface Apparaatprofiel',
-  BOARD_PROFILE_TEXT: 'Selecteer een vooraf ingesteld apparaat profiel uit de lijst of kies Eigen om zelf uw hardware te configureren',
-  BOARD_PROFILE: 'Apparaatprofiel',
-  CUSTOM: 'Custom',
-  GPIO_OF: '{0} GPIO',
-  BUTTON: 'Toets',
-  TEMPERATURE: 'Temperatuur',
-  PHY_TYPE: 'Eth PHY Type',
-  TX_MODE: 'Tx Mode',
-  HARDWARE: 'Hardware',
-  EMS_BUS: '{{BUS|EMS BUS}}',
-  DISABLED: 'Uitgeschakeld',
-  GENERAL_OPTIONS: 'Algemene Opties',
-  LANGUAGE_ENTITIES: 'Taal (voor apparaat entiteiten)',
-  HIDE_LED: 'Verberg LED',
-  ENABLE_TELNET: 'Activeer Telnet console',
-  ENABLE_ANALOG: 'Activeer analoge sensoren',
-  CONVERT_FAHRENHEIT: 'Converteer temperatuurwaarden naar Fahrenheit',
-  BYPASS_TOKEN: 'API Access Token authenticatie uitschakelen',
-  READONLY: 'Activeer read-only modus (blokkeert alle outgaande EMS Tx schrijf commandos)',
-  UNDERCLOCK_CPU: 'Underclock CPU snelheid',
-  HEATINGOFF: 'Start boiler with forced heating off',
-  ENABLE_SHOWER_TIMER: 'Activeer Douche Timer (tijdmeting)',
-  ENABLE_SHOWER_ALERT: 'Activeer Douchemelding',
-  TRIGGER_TIME: 'Trigger tijd',
-  COLD_SHOT_DURATION: 'Tijd Shot koud water',
-  FORMATTING_OPTIONS: 'Formatteringsopties',
-  BOOLEAN_FORMAT_DASHBOARD: 'Boolean formaat dashboard',
-  BOOLEAN_FORMAT_API: 'Boolean formaat API/MQTT',
-  ENUM_FORMAT: 'Enum formaat API/MQTT',
-  INDEX: 'Index',
-  ENABLE_PARASITE: 'Activeer Dallas parasitaire modus',
-  LOGGING: 'Logging',
-  LOG_HEX: 'Log EMS telegrammen in hexadecimaal',
-  ENABLE_SYSLOG: 'Activeer Syslog',
-  LOG_LEVEL: 'Log Level',
-  MARK_INTERVAL: 'Markeringsinterval',
-  SECONDS: 'seconden',
-  MINUTES: 'minuten',
-  HOURS: 'uren',
-  RESTART: 'Herstarten',
-  RESTART_TEXT: 'EMS-ESP dient opnieuw gestart te worden om de wijzingen toe te passen',
-  RESTART_CONFIRM: 'Weet je zeker dat je EMS-ESP wilt herstarten?',
-  COMMAND: 'Commando',
-  CUSTOMIZATIONS_RESTART: 'Alle custom profielen worden verwijderd. Herstarten...',
-  CUSTOMIZATIONS_FULL: 'Te veel entiteiten geselecteerd. Sla op in delen aub',
-  CUSTOMIZATIONS_SAVED: 'Custom aanpassingen opgeslagen',
-  CUSTOMIZATIONS_HELP_1: 'Selecteer een apparaat en pas de entiteiten aan door middel van de opties',
-  CUSTOMIZATIONS_HELP_2: 'Markeer as favoriet',
-  CUSTOMIZATIONS_HELP_3: 'Zet schrijfacties uit',
-  CUSTOMIZATIONS_HELP_4: 'Uitsluiten van MQTT en API',
-  CUSTOMIZATIONS_HELP_5: 'verberg van het Dashboard',
-  CUSTOMIZATIONS_HELP_6: 'remove from memory',
-  SELECT_DEVICE: 'Selecteer een apparaat',
-  SET_ALL: 'Alles aanzetten',
-  OPTIONS: 'Opties',
-  NAME: 'Naam',
-  CUSTOMIZATIONS_RESET: 'Weet je zeker dat je alle custom aanpassingen wilt verwijderen inclusief de custom instellingen voor analoge temperatuursensoren?',
-  DEVICE_ENTITIES: 'Apparaat Entiteiten',
-  USER_CUSTOMIZATION: 'Custom Instellingen',
-  SUPPORT_INFORMATION: 'Support Informatie',
-  CLICK_HERE: 'Klik Hier',
-  HELP_INFORMATION_1: 'Bezoek de online wiki om instructies te vinden om EMS-ESP te configureren',
-  HELP_INFORMATION_2: 'Voor de live community ga naar de Discord server',
-  HELP_INFORMATION_3: 'Om een nieuwe feature te vragen of een bug te rapporteren',
-  HELP_INFORMATION_4: 'zorg dat je ook je systeem details zijn toevoeged voor een sneller antwoord',
-  HELP_INFORMATION_5: 'EMS-ESP is een gratis en open source project. Steun ons met een Star op Github!',
-  SUPPORT_INFO: 'Support Info',
-  UPLOAD_OF: '{0} Upload',
-  UPLOAD: 'Upload',
-  DOWNLOAD: 'Download',
-  ABORTED: 'afgebroken',
-  FAILED: 'mislukt',
-  SUCCESSFUL: 'successvol',
-  SYSTEM: 'Systeem',
-  LOG_OF: '{0} Log',
-  STATUS_OF: '{0} Status',
-  UPLOAD_DOWNLOAD: 'Upload/Download',
-  SYSTEM_VERSION_RUNNING: 'op dit moment draai je versie',
-  SYSTEM_APPLY_FIRMWARE: 'om de nieuwe firmware te activeren',
-  CLOSE: 'Sluiten',
-  USE: 'Gebruik',
-  FACTORY_RESET: 'Fabrieksinstellingen',
-  SYSTEM_FACTORY_TEXT: 'Gateway is gereset en start nu weer op met fabrieksinstellingen',
-  SYSTEM_FACTORY_TEXT_DIALOG: 'Weet je zeker dat je een reset naar fabrieksinstellingen uit wilt voeren?',
-  VERSION_CHECK: 'Versie Check',
-  THE_LATEST: 'De laatste',
-  OFFICIAL: 'official',
-  DEVELOPMENT: 'development',
-  VERSION_IS: 'versie is',
-  RELEASE_NOTES: 'release notes',
-  EMS_ESP_VER: 'EMS-ESP Version',
-  PLATFORM: 'Apparaat (Platform / SDK)',
-  UPTIME: 'Systeem Uptime',
-  CPU_FREQ: 'CPU Frequency',
-  HEAP: 'Heap (Free / Max Alloc)',
-  PSRAM: 'PSRAM (Size / Free)',
-  FLASH: 'Flash Chip (Size / Speed)',
-  APPSIZE: 'Application (Used / Free)',
-  FILESYSTEM: 'File System (Used / Free)',
-  BUFFER_SIZE: 'Max Buffer Size',
-  COMPACT: 'Compact',
-  ENABLE_OTA: 'Acitveer OTA Updates',
-  DOWNLOAD_CUSTOMIZATION_TEXT: 'Download alle custom instellingen',
-  DOWNLOAD_SETTINGS_TEXT: 'Download de applicatie settings. Wees voorzichting met het delen van dit bestand want het bevat o.a. de wachtwoorden in plain text',
-  UPLOAD_TEXT: 'Upload een nieuwe firmware (.bin) file, instellingen of custom instellingen (.json) bestand hieronder',
-  UPLOADING: 'Uploading',
-  UPLOAD_DROP_TEXT: 'Sleep bestand hierheen of klik hier',
-  ERROR: 'Onverwachte fout, probeer opnieuw',
-  TIME_SET: 'Tijd ingesteld',
-  MANAGE_USERS: 'Beheer Gebruikers',
-  IS_ADMIN: 'is Admin',
-  USER_WARNING: 'U dient tenminste 1 admin gebruiker te configureren',
-  ADD: 'Toevoegen',
-  ACCESS_TOKEN_FOR: 'Access Token voor',
-  ACCESS_TOKEN_TEXT: 'Het token hieronder wordt gebruikt voor de REST API calls die authorisatie nodig hebben. Het kan zowel als Bearer token in de Authorization header of in acccess_token URL query parameter gebruikt worden',
-  GENERATING_TOKEN: 'Token aan het genereren',
-  USER: 'Gebruiker',
-  MODIFY: 'Aanpassen',
-  SU_TEXT: 'Het su (super user) wachtwoord wordt gebruikt om authorisatie tokens te signeren en ook om admin privileges te activeren in de console.',
-  NOT_ENABLED: 'Niet geactiveerd',
-  ERRORS_OF: '{0} Foutmeldingen',
-  DISCONNECT_REASON: 'Verbinding verbroken vanwege',
-  ENABLE_MQTT: 'Activeer MQTT',
-  BROKER: 'Broker',
-  CLIENT: 'Client',
-  BASE_TOPIC: 'Base',
-  OPTIONAL: 'Optioneel',
-  FORMATTING: 'Formatteren',
-  MQTT_FORMAT: 'Topic/Payload Formattering',
-  MQTT_NEST_1: 'Genest in 1 topic',
-  MQTT_NEST_2: 'Als individuele topics',
-  MQTT_RESPONSE: 'Publiceer commando output naar een `response` topic',
-  MQTT_PUBLISH_TEXT_1: 'Publiceer enkele waarde topics on change',
-  MQTT_PUBLISH_TEXT_2: 'Publiceer naar commando topics (ioBroker)',
-  MQTT_PUBLISH_TEXT_3: 'Activeer MQTT Discovery (Home Assistant, Domoticz)',
-  MQTT_PUBLISH_TEXT_4: 'Prefix voor de Discovery topics',
-  MQTT_PUBLISH_INTERVALS: 'Publicatie intervallen',
-  MQTT_INT_BOILER: 'CV ketels en warmtepompen',
-  MQTT_INT_THERMOSTATS: 'Thermostaten',
-  MQTT_INT_SOLAR: 'Solar Modules',
-  MQTT_INT_MIXER: 'Mixer Modules',
-  MQTT_INT_HEARTBEAT: 'Heartbeat',
-  MQTT_QUEUE: 'MQTT Queue',
-  DEFAULT: 'Default',
-  MQTT_ENTITY_FORMAT: 'Entity ID format', // TODO translate
-  MQTT_ENTITY_FORMAT_0: 'Single instance, long name (v3.4)', // TODO translate
-  MQTT_ENTITY_FORMAT_1: 'Single instance, short name', // TODO translate
-  MQTT_ENTITY_FORMAT_2: 'Multiple instances, short name', // TODO translate
-  MQTT_CLEAN_SESSION: 'Clean Session aan',
-  MQTT_RETAIN_FLAG: 'Retain flag aan',
-  INACTIVE: 'Inactief',
-  ACTIVE: 'Actief',
-  UNKNOWN: 'Onbekend',
-  SET_TIME: 'Tijd instellen',
-  SET_TIME_TEXT: 'Geef de locale datum en tijd in',
-  LOCAL_TIME: 'Locale Tijd',
-  UTC_TIME: 'UTC Tijd',
-  ENABLE_NTP: 'Activeer NTP',
-  NTP_SERVER: 'NTP Server',
-  TIME_ZONE: 'Tijdzone',
-  ACCESS_POINT: 'Access Point',
-  AP_PROVIDE: 'Activeer Access Point',
-  AP_PROVIDE_TEXT_1: 'altijd',
-  AP_PROVIDE_TEXT_2: 'als WiFi niet is verbonden',
-  AP_PROVIDE_TEXT_3: 'nooit',
-  AP_PREFERRED_CHANNEL: 'Voorkeurskanaal',
-  AP_HIDE_SSID: 'SSID verbergen',
-  AP_CLIENTS: 'AP Clients',
-  AP_MAX_CLIENTS: 'Max Clients',
-  AP_LOCAL_IP: 'Local IP',
-  NETWORK_SCAN: 'Scan WiFi Networken',
-  IDLE: 'Idle',
-  LOST: 'Verloren',
-  SCANNING: 'Scannen',
-  SCAN_AGAIN: 'Opnieuw scannen',
-  NETWORK_SCANNER: 'Netwerk Scanner',
-  NETWORK_NO_WIFI: 'Geen WiFi networken gevonden',
-  NETWORK_BLANK_SSID: 'laat leeg om WiFi uit te schakelen',
-  TX_POWER: 'Tx Vermogen',
-  HOSTNAME: 'Hostname',
-  NETWORK_DISABLE_SLEEP: 'WiFi Sleep Mode uitzetten',
-  NETWORK_LOW_BAND: 'Lagere WiFi bandbreedte gebruiken',
-  NETWORK_USE_DNS: 'Activeer mDNS Service',
-  NETWORK_ENABLE_CORS: 'Activeer CORS',
-  NETWORK_CORS_ORIGIN: 'CORS origin',
-  NETWORK_ENABLE_IPV6: 'Activeer IPv6 support',
-  NETWORK_FIXED_IP: 'Gebruik vast IP addres',
-  NETWORK_GATEWAY: 'Gateway',
-  NETWORK_SUBNET: 'Subnetmasker',
-  NETWORK_DNS: 'DNS Servers',
-  ADDRESS_OF: '{0} Address',
-  ADMIN: 'Admin',
-  GUEST: 'Gast',
-  NEW: 'Nieuwe',
-  NEW_NAME_OF: 'Hernoem {0}',
-  ENTITY: 'Entiteit',
-  MIN: 'min',
-  MAX: 'max'
-};
-
-export default nl;
--- a/interface/src/i18n/no/index.ts
+++ b/interface/src/i18n/no/index.ts
@@ -1,310 +0,0 @@
-import type { Translation } from '../i18n-types';
-/* prettier-ignore */
-/* eslint-disable */
-
-const no: Translation = {
-  LANGUAGE: 'Språk',
-  RETRY: 'Forsøk igjen',
-  LOADING: 'Laster',
-  IS_REQUIRED: '{0} er nødvendig',
-  SIGN_IN: 'Logg inn',
-  SIGN_OUT: 'Logg ut',
-  USERNAME: 'Brukernavn',
-  PASSWORD: 'Passord',
-  SU_PASSWORD: 'su Passord',
-  DASHBOARD: 'Dashboard',
-  SETTINGS_OF: '{0} Innstillinger',
-  SAVED: 'lagret',
-  HELP_OF: '{0} Hjelp',
-  LOGGED_IN: 'Logget in som {name}',
-  PLEASE_SIGNIN: 'Venligst logge inn for å fortsetta',
-  UPLOAD_SUCCESSFUL: 'Opplasting lykkes',
-  DOWNLOAD_SUCCESSFUL: 'Nedlasting lykkes',
-  INVALID_LOGIN: 'Ugyldig innlogging',
-  NETWORK: 'Nettverk',
-  SECURITY: 'Sikkerhet',
-  ONOFF_CAP: 'PÅ/AV',
-  ONOFF: 'på/av',
-  TYPE: 'Type',
-  DESCRIPTION: 'Beskrivelse',
-  ENTITIES: 'Ojekter',
-  REFRESH: 'Oppdater',
-  EXPORT: 'Eksport',
-  DEVICE_DETAILS: 'Enhetsdetaljer',
-  ID_OF: '{0}-ID',
-  DEVICE: 'Enhets',
-  PRODUCT: 'Produkt',
-  VERSION: 'Versjon',
-  BRAND: 'Fabrikat',
-  ENTITY_NAME: 'Objektsnavn',
-  VALUE: '{{Verdi|verdi}}',
-  SHOW_FAV: ' Vis kun favoritter',
-  DEVICE_SENSOR_DATA: 'Enheter og Sensordata',
-  DEVICES_SENSORS: 'Enheter og Sensorer',
-  ATTACHED_SENSORS: 'Tilkoblede EMS-ESP Sensorer',
-  RUN_COMMAND: 'Kjør kommando',
-  CHANGE_VALUE: 'Endre Verdi',
-  CANCEL: 'Avbryt',
-  RESET: 'Nullstill',
-  SEND: 'Send',
-  SAVE: 'Lagre',
-  REMOVE: 'Fjern',
-  PROBLEM_UPDATING: 'Problem med oppdatering',
-  PROBLEM_LOADING: 'Problem med opplasting',
-  ACCESS_DENIED: 'Tilgang nektet',
-  ANALOG_SENSOR: 'Analog Sensor',
-  ANALOG_SENSORS: 'Analoge Sensorer',
-  UPDATED_OF: '{0} Oppdatert',
-  UPDATE_OF: '{0} Oppdater',
-  REMOVED_OF: '{0} Slettet',
-  DELETION_OF: '{0} Sletting',
-  OFFSET: 'Kompensering',
-  FACTOR: 'Faktor',
-  FREQ: 'Frekvens',
-  DUTY_CYCLE: 'Duty Cycle',
-  UNIT: 'UoM',
-  STARTVALUE: 'Startverdi',
-  WARN_GPIO: 'Advarsel: vær forsiktig ved aktivering av GPIO!',
-  EDIT: 'Endre',
-  SENSOR: 'Sensor',
-  TEMP_SENSOR: 'Temperatursensor',
-  TEMP_SENSORS: 'Temperaturesensorer',
-  WRITE_CMD_SENT: 'Skriv kommando sent', // TODO translate
-  WRITE_CMD_FAILED: 'Skriv kommando failed', // TODO translate
-  EMS_BUS_WARNING: 'EMS bussen koblet ned. Hvis denne advarselen fortsetter etter noen f¨sekunder sjekk instillinger og  prosessorkort',
-  EMS_BUS_SCANNING: 'Søker etter EMS enheter...',
-  CONNECTED: 'Tilkoblet',
-  TX_ISSUES: 'Tx problemer - prøv en annen Tx Modus',
-  DISCONNECTED: 'Frakoblet',
-  EMS_SCAN: 'Er du sikker på du vil starte full søking av EMS bussen?',
-  EMS_BUS_STATUS: 'EMS Buss Status',
-  ACTIVE_DEVICES: 'Aktive Enheter og Sensorer',
-  EMS_DEVICE: 'EMS Enhet',
-  SUCCESS: 'VELLYKKET',
-  FAIL: 'MISLYKKET',
-  QUALITY: 'KVALITET',
-  SCAN_DEVICES: 'Søk etter nye enheter',
-  EMS_BUS_STATUS_TITLE: 'EMS Buss & Aktivitet Status',
-  SCAN: 'Søk',
-  STATUS_NAMES: [
-    'EMS Telegrammer Mottatt (Rx)',
-    'EMS Lest (Tx)',
-    'EMS Skrevet (Tx)',
-    'Temperatur Sensor Lest',
-    'Analog Sensor Lest',
-    'MQTT Publiseringer',
-    'API Anrop',
-    'Syslog Meldinger'
-  ],
-  NUM_DEVICES: '{num} Enhet{{er}}',
-  NUM_TEMP_SENSORS: '{num} Temperatursensor{{er}}',
-  NUM_ANALOG_SENSORS: '{num} Analogsensor{{er}}',
-  NUM_DAYS: '{num} sag{{er}}',
-  NUM_SECONDS: '{num} sekund{{er}}',
-  NUM_HOURS: '{num} time{{r}}',
-  NUM_MINUTES: '{num} minutt{{er}}',
-  APPLICATION_SETTINGS: 'Innstillinger',
-  CUSTOMIZATION: 'Tilpasninger',
-  APPLICATION_RESTARTING: 'EMS-ESP restarter',
-  INTERFACE_BOARD_PROFILE: 'Interface Prosessor Profil',
-  BOARD_PROFILE_TEXT: 'Velg en pre-konfigurert prosessor profil fra listen under eller velg  Tilpasset for å konfigurere dine egne innstillinger',
-  BOARD_PROFILE: 'Prosessor Profil',
-  CUSTOM: 'Custom',
-  GPIO_OF: '{0} GPIO',
-  BUTTON: 'Knapp',
-  TEMPERATURE: 'Temperatur',
-  PHY_TYPE: 'Eth PHY Type',
-  DISABLED: 'avslått',
-  TX_MODE: 'Tx Mode',
-  HARDWARE: 'Hardware',
-  EMS_BUS: '{{BUS|EMS BUS}}',
-  GENERAL_OPTIONS: 'Generelle Innstillinger',
-  LANGUAGE_ENTITIES: 'Språk (for objekter)',
-  HIDE_LED: 'Skjul LED',
-  ENABLE_TELNET: 'Aktiver Telnet',
-  ENABLE_ANALOG: 'Aktiver Analoge Sensorer',
-  CONVERT_FAHRENHEIT: 'Konverter temperatur til Fahrenheit',
-  BYPASS_TOKEN: 'Utelat Aksess Token authorisering av API kall',
-  READONLY: 'Aktiver read-only modus (blokker all EMS Tx Skriving)',
-  UNDERCLOCK_CPU: 'Underklokking av prosessorhastighet',
-  HEATINGOFF: 'Start boiler with forced heating off',
-  ENABLE_SHOWER_TIMER: 'Aktiver Dusjtimer',
-  ENABLE_SHOWER_ALERT: 'Aktiver Dusj-varsling',
-  TRIGGER_TIME: 'Aktiveringstid',
-  COLD_SHOT_DURATION: 'Tid på kaldt vann',
-  FORMATTING_OPTIONS: 'Formatteringsalternativs',
-  BOOLEAN_FORMAT_DASHBOARD: 'Bool Format Dashboard',
-  BOOLEAN_FORMAT_API: 'Bool Format API/MQTT',
-  ENUM_FORMAT: 'Enum Format API/MQTT',
-  INDEX: 'Indeks',
-  ENABLE_PARASITE: 'Aktiver parasitt strømforsyning',
-  LOGGING: 'Logging',
-  LOG_HEX: 'Logg EMS telegrammer i hexadesimal',
-  ENABLE_SYSLOG: 'Aktiver Syslog',
-  LOG_LEVEL: 'Log Level',
-  MARK_INTERVAL: 'Oppdateringsintervall',
-  SECONDS: 'sekunder',
-  MINUTES: 'minutter',
-  HOURS: 'timer',
-  RESTART: 'Omstart',
-  RESTART_TEXT: 'EMS-ESP må omstartes for å iverksette endrede systeminstillinger',
-  RESTART_CONFIRM: 'Er du sikker på at du vil omstarte EMS-ESP?',
-  COMMAND: 'Kommando',
-  CUSTOMIZATIONS_RESTART: 'Alle tilpasninger har blitt slettet. Restarter...',
-  CUSTOMIZATIONS_FULL: 'Antall valgte objekter for høyt. Largre i mindre antall om gangen',
-  CUSTOMIZATIONS_SAVED: 'Tilpasninger lagret',
-  CUSTOMIZATIONS_HELP_1: 'Velg en enhet og tilpass underenheter med hjelp av alternativer eller velg å gi nytt navn',
-  CUSTOMIZATIONS_HELP_2: 'merk som favoritt',
-  CUSTOMIZATIONS_HELP_3: 'inaktiviser skriving',
-  CUSTOMIZATIONS_HELP_4: 'ekskludere fra MQTT og API',
-  CUSTOMIZATIONS_HELP_5: 'gjemme fra Dashboard',
-  CUSTOMIZATIONS_HELP_6: 'remove from memory',
-  SELECT_DEVICE: 'Velg en enhet',
-  SET_ALL: 'sett alle',
-  OPTIONS: 'Alternativ',
-  NAME: 'Navn',
-  CUSTOMIZATIONS_RESET: 'Er du sikker på att du vil fjerne tilpassninger inkludert innstillinger for Temperatur og Analoge sensorer?',
-  DEVICE_ENTITIES: 'Enhets objekter',
-  USER_CUSTOMIZATION: 'Brukertilpasninger',
-  SUPPORT_INFORMATION: 'Supportinformasjon',
-  CLICK_HERE: 'Klikk her',
-  HELP_INFORMATION_1: 'Besøk wiki for instruksjoner for å konfigurere EMS-ESP',
-  HELP_INFORMATION_2: 'For community-support besøk vår Discord-server',
-  HELP_INFORMATION_3: 'For å be om en ny funksjon eller melde feil',
-  HELP_INFORMATION_4: 'husk å laste ned og legg ved din systeminformasjon for en raskere respons når du rapporterer et problem',
-  HELP_INFORMATION_5: 'EMS-ESP er gratis og åpen kildekode. Bidra til utviklingen ved å gi oss en stjerne på GitHub!',
-  SUPPORT_INFO: 'Supportinfo',
-  UPLOAD_OF: '{0} Opplasning',
-  UPLOAD: 'Opplasning',
-  DOWNLOAD: 'Nedlasting',
-  ABORTED: 'avbrutt',
-  FAILED: 'feilet',
-  SUCCESSFUL: 'vellykket',
-  SYSTEM: 'System',
-  LOG_OF: '{0} Logg',
-  STATUS_OF: '{0} Status',
-  UPLOAD_DOWNLOAD: 'Opp/Nedlasting',
-  SYSTEM_VERSION_RUNNING: 'Du benytter versjon',
-  SYSTEM_APPLY_FIRMWARE: 'for å aktivere ny firmware',
-  CLOSE: 'Steng',
-  USE: 'Bruk',
-  FACTORY_RESET: 'Sett tilbake til fabrikkinstilling',
-  SYSTEM_FACTORY_TEXT: 'Enhet har blitt satt tilbake til fabrikkinstilling og vil restarte',
-  SYSTEM_FACTORY_TEXT_DIALOG: 'Er du sikker på at du vil resette enheten til fabrikkinstillinger?',
-  VERSION_CHECK: 'Versjonsjekk',
-  THE_LATEST: 'Den nyeste',
-  OFFICIAL: 'official',
-  DEVELOPMENT: 'development',
-  VERSION_IS: 'versjonen er',
-  RELEASE_NOTES: 'release notes',
-  EMS_ESP_VER: 'EMS-ESP Version',
-  PLATFORM: 'Enhet (Platform / SDK)',
-  UPTIME: 'System Oppetid',
-  CPU_FREQ: 'CPU Frekvens',
-  HEAP: 'Heap (Ledig / Max Allokert)',
-  PSRAM: 'PSRAM (Størrelse / Ledig)',
-  FLASH: 'Flash Chip (Størrelse / Hastighet)',
-  APPSIZE: 'Applikasjon (Brukt / Ledig)',
-  FILESYSTEM: 'File System (Brukt / Ledig)',
-  BUFFER_SIZE: 'Max Buffer Størrelse',
-  COMPACT: 'Komprimere',
-  ENABLE_OTA: 'Aktiviser OTA oppdateringer',
-  DOWNLOAD_CUSTOMIZATION_TEXT: 'Last ned objektstilpasninger',
-  DOWNLOAD_SETTINGS_TEXT: 'Last ned applikasjonskonfigurasjon. Vær varsom med å dele fila da den inneholder passord og annen sensitiv system informasjon',
-  UPLOAD_TEXT: 'Last opp en ny firmware (.bin) fil, innstillinger eller tilpassninger (.json) fil nedenfor',
-  UPLOADING: 'Opplasting',
-  UPLOAD_DROP_TEXT: 'Slipp fil eller klikk her',
-  ERROR: 'Ukjent feil, prøv igjen',
-  TIME_SET: 'Still in tid',
-  MANAGE_USERS: 'Administrer Brukere',
-  IS_ADMIN: 'er Admin',
-  USER_WARNING: 'Du må ha minst en admin bruker konfigurert',
-  ADD: 'Legg til',
-  ACCESS_TOKEN_FOR: 'Aksess Token for',
-  ACCESS_TOKEN_TEXT: 'Token nedenfor benyttes med REST API-kall som krever autorisering. Den kan sendes med enten som en Bearer token i Authorization-headern eller i access_token URL query-parameter.',
-  GENERATING_TOKEN: 'Generer token',
-  USER: 'Bruker',
-  MODIFY: 'Endre',
-  SU_TEXT: 'su brukeren (super user) passord benyttes for å signere autentiserings token samt å tillate admin privileger i konsoll modus.',
-  NOT_ENABLED: 'Ikke aktiv',
-  ERRORS_OF: '{0} Feil',
-  DISCONNECT_REASON: 'Årsak til nedkobling',
-  ENABLE_MQTT: 'Aktiver MQTT',
-  BROKER: 'Broker',
-  CLIENT: 'Client',
-  BASE_TOPIC: 'Base',
-  OPTIONAL: 'Valgfritt',
-  FORMATTING: 'Formatering',
-  MQTT_FORMAT: 'Topic/Payload Format',
-  MQTT_NEST_1: 'Nestet i en topic',
-  MQTT_NEST_2: 'Som individuelle topics',
-  MQTT_RESPONSE: 'Publiser kommandoer til en `response` topic',
-  MQTT_PUBLISH_TEXT_1: 'Publiser singel verdi topics ved endringer',
-  MQTT_PUBLISH_TEXT_2: 'Publiser til kommando topics (ioBroker)',
-  MQTT_PUBLISH_TEXT_3: 'Aktiver MQTT Discovery (Home Assistant, Domoticz)',
-  MQTT_PUBLISH_TEXT_4: 'Prefiks for Discovery topics',
-  MQTT_PUBLISH_INTERVALS: 'Publiseringsintervall',
-  MQTT_INT_BOILER: 'Fyr/Varmepumpe',
-  MQTT_INT_THERMOSTATS: 'Termostat',
-  MQTT_INT_SOLAR: 'Solpaneler',
-  MQTT_INT_MIXER: 'Blandeventil',
-  MQTT_INT_HEARTBEAT: 'Heartbeat',
-  MQTT_QUEUE: 'MQTT Queue',
-  DEFAULT: 'Standard',
-  MQTT_ENTITY_FORMAT: 'Entity ID format', // TODO translate
-  MQTT_ENTITY_FORMAT_0: 'Single instance, long name (v3.4)', // TODO translate
-  MQTT_ENTITY_FORMAT_1: 'Single instance, short name', // TODO translate
-  MQTT_ENTITY_FORMAT_2: 'Multiple instances, short name', // TODO translate
-  MQTT_CLEAN_SESSION: 'Benytt Clean Session',
-  MQTT_RETAIN_FLAG: 'Alltid sett Retain flag',
-  INACTIVE: 'Innaktiv',
-  ACTIVE: 'Aktiv',
-  UNKNOWN: 'Ukjent',
-  SET_TIME: 'Sett Tid',
-  SET_TIME_TEXT: 'Skriv inn dato og klokke nedenfor',
-  LOCAL_TIME: 'Lokaltid',
-  UTC_TIME: 'UTC Tid',
-  ENABLE_NTP: 'Aktiver NTP',
-  NTP_SERVER: 'NTP Server',
-  TIME_ZONE: 'Tidssone',
-  ACCESS_POINT: 'Aksesspunkt',
-  AP_PROVIDE: 'Aktiver Aksesspunkt',
-  AP_PROVIDE_TEXT_1: 'alltid',
-  AP_PROVIDE_TEXT_2: 'når WiFi er utilgjengelig',
-  AP_PROVIDE_TEXT_3: 'aldri',
-  AP_PREFERRED_CHANNEL: 'Foretrukket kanal',
-  AP_HIDE_SSID: 'Skjul SSID',
-  AP_CLIENTS: 'AP Clients',
-  AP_MAX_CLIENTS: 'Max Clients',
-  AP_LOCAL_IP: 'Local IP',
-  NETWORK_SCAN: 'Søk etter trådløst nettverk',
-  IDLE: 'Klar',
-  LOST: 'Mistet',
-  SCANNING: 'Søker',
-  SCAN_AGAIN: 'Søk igjen',
-  NETWORK_SCANNER: 'Nettverk Scanner',
-  NETWORK_NO_WIFI: 'Ingen trådløse nett funnet',
-  NETWORK_BLANK_SSID: 'la feltet være blankt for å deaktivisere trådløst nettverk',
-  TX_POWER: 'Tx Effekt',
-  HOSTNAME: 'Hostname',
-  NETWORK_DISABLE_SLEEP: 'Hindre at trådløst nettverk går i Sleep Mode',
-  NETWORK_LOW_BAND: 'Benytt smalere båndbredde på trådløst nettverk',
-  NETWORK_USE_DNS: 'Aktiviser mDNS Service',
-  NETWORK_ENABLE_CORS: 'Aktiviser CORS',
-  NETWORK_CORS_ORIGIN: 'CORS origin',
-  NETWORK_ENABLE_IPV6: 'Aktiviser IPv6 støtte',
-  NETWORK_FIXED_IP: 'Benytt statisk IP adresse',
-  NETWORK_GATEWAY: 'Gateway',
-  NETWORK_SUBNET: 'Nettverksmaske',
-  NETWORK_DNS: 'DNS Servers',
-  ADDRESS_OF: '{0} Address',
-  ADMIN: 'Admin',
-  GUEST: 'Gjest',
-  NEW: 'Ny',
-  NEW_NAME_OF: 'Bytt navn {0}',
-  ENTITY: 'Entitet',
-  MIN: 'min',
-  MAX: 'max'
-};
-
-export default no;
--- a/interface/src/i18n/pl/index.ts
+++ b/interface/src/i18n/pl/index.ts
@@ -1,310 +0,0 @@
-import type { BaseTranslation } from '../i18n-types';
-/* prettier-ignore */
-/* eslint-disable */
-
-const pl: BaseTranslation = {
-  LANGUAGE: 'Język',
-  RETRY: 'Ponów',
-  LOADING: 'Ładowanie',
-  IS_REQUIRED: 'Pole {0} nie może być puste!',
-  SIGN_IN: 'Zaloguj się',
-  SIGN_OUT: 'Wyloguj się',
-  USERNAME: '{{Użytkownik|Nazwa użytkownika|}}',
-  PASSWORD: 'Hasło',
-  SU_PASSWORD: 'Hasło "su"',
-  DASHBOARD: 'Pulpit',
-  SETTINGS_OF: 'Ustawienia {0}',
-  SAVED: 'zostały zapisane.',
-  HELP_OF: 'Pomoc {0}',
-  LOGGED_IN: 'Zalogowano użytkownika {name}.',
-  PLEASE_SIGNIN: 'Zaloguj się aby kontynuować.',
-  UPLOAD_SUCCESSFUL: 'Wysyłanie zakończone.',
-  DOWNLOAD_SUCCESSFUL: 'Pobieranie zakończone.',
-  INVALID_LOGIN: 'Nieprawidłowy użytkownik lub hasło!',
-  NETWORK: '{{Sieć|sieci|}}',
-  SECURITY: '{{B|b|}}ezpieczeństw{{o|a|}}',
-  ONOFF_CAP: 'wł./wył.',
-  ONOFF: 'włączono/wyłączono',
-  TYPE: 'Typ',
-  DESCRIPTION: 'Opis',
-  ENTITIES: 'Encje',
-  REFRESH: 'Odśwież',
-  EXPORT: 'Eksportuj',
-  DEVICE_DETAILS: 'Szczegóły urządzenia',
-  ID_OF: 'ID {0}',
-  DEVICE: 'urządzenia',
-  PRODUCT: 'produktu',
-  BRAND: 'Marka',
-  VERSION: 'Wersja',
-  ENTITY_NAME: 'Nazwa encji',
-  VALUE: '{{W|w|}}artość',
-  SHOW_FAV: 'Pokaż tylko "ulubione"',
-  DEVICE_SENSOR_DATA: 'Dane z urządzeń i czujników',
-  DEVICES_SENSORS: 'Urządzenia i czujniki',
-  ATTACHED_SENSORS: 'Urządzenia podłączone do EMS-ESP (czujniki temperatury/analogowe/cyfrowe, wyjścia cyfrowe)',
-  RUN_COMMAND: 'Wykonaj komendę',
-  CHANGE_VALUE: 'Zmień wartość',
-  CANCEL: 'Anuluj',
-  RESET: 'Reset{{uj|owanie|}}',
-  SEND: 'Wyślij',
-  SAVE: 'Zapisz',
-  REMOVE: 'Usuń',
-  PROBLEM_UPDATING: 'Problem z uaktualnieniem!',
-  PROBLEM_LOADING: 'Problem z załadowaniem!',
-  ACCESS_DENIED: 'Brak dostępu!',
-  ANALOG_SENSOR: 'urządzenia podłączonego do EMS-ESP',
-  ANALOG_SENSORS: 'Urządzenia podłączone do EMS-ESP',
-  UPDATED_OF: 'Zaktualizowano ustawienia {0}.',
-  UPDATE_OF: 'Aktualizacja {0}',
-  REMOVED_OF: 'Usunięto ustawienia {0}.',
-  DELETION_OF: 'Kasowanie {0}',
-  OFFSET: 'Korekta ±',
-  FACTOR: 'Mnożnik',
-  FREQ: 'Częstotliwość',
-  DUTY_CYCLE: 'Wypełnienie',
-  UNIT: 'J.m.',
-  STARTVALUE: 'Wartość początkowa',
-  WARN_GPIO: 'Uwaga! Zachowaj ostrożność przypisując GPIO do urządzenia!',
-  EDIT: 'Edycja',
-  SENSOR: 'czujnika',
-  TEMP_SENSOR: 'czujnika temperatury',
-  TEMP_SENSORS: 'Czujniki temperatury 1-Wire®',
-  WRITE_CMD_SENT: 'Komenda zapisu została wysłana.',
-  WRITE_CMD_FAILED: 'Komenda zapisu nie powiodła się!',
-  EMS_BUS_WARNING: 'Brak połączenia z magistralą EMS. Jeśli ten błąd występuje dłużej niż kilka sekund, sprawdź ustawienia oraz profil płytki interfejsu.',
-  EMS_BUS_SCANNING: 'Trwa skanowanie urządzeń na magistrali EMS...',
-  CONNECTED: '{{połączono|połączenie|}}',
-  TX_ISSUES: 'problem z zapisem na magistralę EMS, spróbuj wybrać inny "Tryb transmisji (Tx)"',
-  DISCONNECTED: 'brak połączenia',
-  EMS_SCAN: 'Czy na pewno wykonać pełne skanowanie magistrali EMS?',
-  EMS_BUS_STATUS: 'Status magistrali EMS',
-  ACTIVE_DEVICES: 'Aktywne urządzenia i czujniki',
-  EMS_DEVICE: 'Urządzenie EMS',
-  SUCCESS: 'Udane',
-  FAIL: 'Nieudane',
-  QUALITY: 'Jakość',
-  SCAN_DEVICES: 'Wyszukiwanie nowych urządzeń',
-  EMS_BUS_STATUS_TITLE: 'Aktywność',
-  SCAN: 'Skanuj',
-  STATUS_NAMES: [
-    'EMS, telegramy odebrane (Rx)',
-    'EMS, wysłane telegramy "odczyt" (Tx)',
-    'EMS, wysłane telegramy "zapis" (Tx)',
-    'Odczyty czujników temperatury 1-Wire®',
-    'Odczyty czujników analogowych i cyfrowych',
-    'Publikacje MQTT',
-    'Wywołania API',
-    'Wpisy w SysLog'
-  ],
-  NUM_DEVICES: '{num} urządze{{ń|nie|nia|nia|ń}} EMS',
-  NUM_TEMP_SENSORS: '{num} czujni{{ków|k|ki|ki|ków}} temperatury',
-  NUM_ANALOG_SENSORS: '{num} inn{{ych|e|e|e|ych}} urządze{{ń|nie|nia(two)|nia|ń}} podłączon{{ych|e|e|e|ych}} do EMS-ESP',
-  NUM_DAYS: '{num} d{{ni|zień|ni|ni|ni}}',
-  NUM_SECONDS: '{num} sekun{{d|da|dy|dy|d}}',
-  NUM_HOURS: '{num} godzi{{n|na|ny|ny|n}}',
-  NUM_MINUTES: '{num} minu{{t|ta|ty|ty|t}}',
-  APPLICATION_SETTINGS: 'Ustawienia aplikacji',
-  CUSTOMIZATION: 'Personalizacja',
-  APPLICATION_RESTARTING: 'Trwa ponowne uruchamianie',
-  INTERFACE_BOARD_PROFILE: 'Profil płytki interfejsu',
-  BOARD_PROFILE_TEXT: 'Wybierz z listy gotowy profil płytki interfejsu lub "własny..." i samodzielnie skonfiguruj posiadany sprzęt.',
-  BOARD_PROFILE: 'Profil płytki',
-  CUSTOM: 'własny',
-  GPIO_OF: 'GPIO {0}',
-  BUTTON: 'przycisku',
-  TEMPERATURE: '1-Wire®',
-  PHY_TYPE: 'Typ układu ethernetowego (PHY)',
-  DISABLED: '{{wyłączono|brak|}}',
-  TX_MODE: 'Tryb transmisji (Tx)',
-  EMS_BUS: '{{magistrali EMS|na magistrali|}}',
-  HARDWARE: 'sprzętowy',
-  GENERAL_OPTIONS: 'Opcje podstawowe',
-  LANGUAGE_ENTITIES: 'Język encji',
-  HIDE_LED: 'Wyłącz LED',
-  ENABLE_TELNET: 'Aktywuj dostęp dla konsoli Telnet',
-  ENABLE_ANALOG: 'Aktywuj urządzenia GPIO (czujniki analogowe i cyfrowe oraz wyjścia cyfrowe)',
-  CONVERT_FAHRENHEIT: 'Konwertuj temperatury do skali Fahrenheita',
-  BYPASS_TOKEN: 'Pomiń autoryzację tokenem w wywołaniach API',
-  READONLY: 'Tryb pracy "tylko do odczytu" (blokuje wszystkie komendy zapisu na magistralę EMS)',
-  UNDERCLOCK_CPU: 'Obniż taktowanie CPU',
-  HEATINGOFF: 'Start boiler with forced heating off',
-  ENABLE_SHOWER_TIMER: 'Aktywuj minutnik prysznica',
-  ENABLE_SHOWER_ALERT: 'Aktywuj alarm prysznica',
-  TRIGGER_TIME: 'Wyzwalaj po czasie',
-  COLD_SHOT_DURATION: 'Czas trwania tryśnięcia zimnej wody',
-  FORMATTING_OPTIONS: 'Opcje formatowania',
-  BOOLEAN_FORMAT_DASHBOARD: 'Wartości dwustanowe na pulpicie',
-  BOOLEAN_FORMAT_API: 'Wartości dwustanowe w API/MQTT',
-  ENUM_FORMAT: 'Wartości z listy w API/MQTT',
-  INDEX: 'indeks',
-  ENABLE_PARASITE: 'Aktywuj zasilanie pasożytnicze',
-  LOGGING: 'Logowanie',
-  LOG_HEX: 'Loguj telegramy EMS w systemie szesnastkowym (hex)',
-  ENABLE_SYSLOG: 'Aktywuj SysLog',
-  LOG_LEVEL: 'Poziom logowania',
-  MARK_INTERVAL: 'Znaczniki interwałów (0=brak)',
-  SECONDS: 'sekund',
-  MINUTES: 'minut',
-  HOURS: 'godzin',
-  RESTART: 'Restart',
-  RESTART_TEXT: 'Aby zastosować wprowadzone zmiany interfejs EMS-ESP musi zostać zrestartowany.',
-  RESTART_CONFIRM: 'Jesteś pewien, że chcesz zrestartować interfejs EMS-ESP?',
-  COMMAND: 'KOMENDA',
-  CUSTOMIZATIONS_RESTART: 'Wszystkie personalizacje zostały usunięte. Restartuję...',
-  CUSTOMIZATIONS_FULL: 'Wybrano za dużo obiektów. Wprowadź zmiany w mniejszych partiach.',
-  CUSTOMIZATIONS_SAVED: 'Personalizacje zostały zapisane.',
-  CUSTOMIZATIONS_HELP_1: 'Wybierz urządzenie EMS, dostosuj opcje lub kliknij by zmienić nazwę encji.',
-  CUSTOMIZATIONS_HELP_2: 'oznacz jako ulubioną',
-  CUSTOMIZATIONS_HELP_3: 'zablokuj akcje zapisu',
-  CUSTOMIZATIONS_HELP_4: 'wyklucz z MQTT i API',
-  CUSTOMIZATIONS_HELP_5: 'ukryj na pulpicie',
-  CUSTOMIZATIONS_HELP_6: 'usuń z pamięci',
-  SELECT_DEVICE: 'wybierz urządzenie',
-  SET_ALL: 'Ustaw wszystko jako',
-  OPTIONS: 'Opcje',
-  NAME: '{{Nazwa|nazwa|}}',
-  CUSTOMIZATIONS_RESET:  'Czy jesteś pewien, że chcesz usunąć wszystkie personalizacje łącznie z ustawieniami dla czujników temperatury 1-Wire® i urządzeń podłączonych do EMS-ESP?',
-  DEVICE_ENTITIES: 'Encje urządzenia',
-  USER_CUSTOMIZATION: 'Personalizacje użytkownika',
-  SUPPORT_INFORMATION: 'Informacje dotyczące wsparcia',
-  CLICK_HERE: 'Kliknij tu',
-  HELP_INFORMATION_1: 'Aby uzyskać instrukcje dotyczące konfiguracji EMS-ESP skorzystaj z wiki w internecie',
-  HELP_INFORMATION_2: 'Aby dołączyć do naszego serwera Discord i komunikować się na żywo ze społecznością',
-  HELP_INFORMATION_3: 'Aby zaproponować nową funkcjonalność lub zgłosić problem',
-  HELP_INFORMATION_4: 'Zgłaszając problem, nie zapomnij dołączyć informacji o swoim systemie!',
-  HELP_INFORMATION_5: 'EMS-ESP jest darmowym projektem typu open-source. Aby go wesprzeć, rozważ przyznanie nam gwiazdki na Github!',
-  SUPPORT_INFO: 'Pobierz informacje',
-  UPLOAD_OF: 'Wysyłanie {0}',
-  UPLOAD: 'Wysyłanie',
-  DOWNLOAD: '{{P|p||P}}obier{{anie|z||z}}',
-  ABORTED: 'zostało przerwane!',
-  FAILED: 'nie powiodło się!',
-  SUCCESSFUL: 'powiodło się.',
-  SYSTEM: '{{S|s||s}}yste{{m|mu||mowy}}',
-  LOG_OF: 'Log {0}',
-  STATUS_OF: 'Status {0}',
-  UPLOAD_DOWNLOAD: 'Przesyłanie plików',
-  SYSTEM_VERSION_RUNNING: 'Obecnie zainstalowana wersja to:',
-  SYSTEM_APPLY_FIRMWARE: '',
-  CLOSE: 'Zamknij',
-  USE: 'Aby zaktualizować firmware skorzystaj z funkcji',
-  FACTORY_RESET: 'Ustawienia fabryczne',
-  SYSTEM_FACTORY_TEXT: 'Interfejs EMS-ESP został przywrócony do ustawień fabrycznych i zostanie teraz ponownie uruchomiony.',
-  SYSTEM_FACTORY_TEXT_DIALOG: 'Czy jesteś pewien, że chcesz przywrócić ustawienia fabryczne interfejsu EMS-ESP? ',
-  VERSION_CHECK: 'Sprawd{{ź|zanie|}} wersj{{ę|i|}}',
-  THE_LATEST: 'Najnowsza',
-  OFFICIAL: 'oficjalna',
-  DEVELOPMENT: 'testowa',
-  VERSION_IS: 'wersja to',
-  RELEASE_NOTES: 'lista zmian',
-  EMS_ESP_VER: 'Wersja EMS-ESP',
-  PLATFORM: 'Urządzenie (platforma / SDK)',
-  UPTIME: 'Czas działania systemu',
-  CPU_FREQ: 'Taktowanie CPU',
-  HEAP: 'HEAP (wolne / maksymalny przydział)',
-  PSRAM: 'PSRAM (rozmiar / wolne)',
-  FLASH: 'FLASH (rozmiar / taktowanie)',
-  APPSIZE: 'Aplikacja (wykorzystane / wolne)',
-  FILESYSTEM: 'System plików (wykorzystane / wolne)',
-  BUFFER_SIZE: 'Maksymalna pojemność bufora (ilość wpisów)',
-  COMPACT: 'Kompaktowy',
-  ENABLE_OTA: 'Aktywuj aktualizację OTA',
-  DOWNLOAD_CUSTOMIZATION_TEXT: 'Pobierz personalizacje',
-  DOWNLOAD_SETTINGS_TEXT: 'Pobierz ustawienia aplikacji. Uważaj jeśli udostępniasz plik z ustawieniami, ponieważ zawiera on hasła oraz inne wrażliwe informacje!',
-  UPLOAD_TEXT: 'Wyślij firmware (.bin), ustawienia lub personalizacje (.json). Opcjonalnie, wyślij wcześniej plik walidacji (.md5).',
-  UPLOADING: 'Wysłano',
-  UPLOAD_DROP_TEXT: 'Przeciągnij tutaj plik lub kliknij',
-  ERROR: 'Nieoczekiwany błąd, spróbuj ponownie!',
-  TIME_SET: 'Zegar został ustawiony.',
-  MANAGE_USERS: 'Zarządzanie użytkownikami',
-  IS_ADMIN: '{{Administrator|Uprawnienia administratora|}}',
-  USER_WARNING: 'Przynajmniej jeden użytkownik musi mieć uprawnienia administratora!',
-  ADD: 'Doda{{j|wanie|}}',
-  ACCESS_TOKEN_FOR: 'Token dostępu dla użytkownika',
-  ACCESS_TOKEN_TEXT: 'Token jest używany w wywołaniach REST API wymagających autoryzacji. Można go przekazywać bezpośrednio lub przez URL.',
-  GENERATING_TOKEN: 'Generowanie tokenu',
-  USER: '{{Użytkownik|użytkownika|}}',
-  MODIFY: 'Edycja',
-  SU_TEXT: 'Hasło "su" (super-użytkownika) służy do podpisywania tokenów autoryzujących oraz włączania uprawnień administratora w konsoli.',
-  NOT_ENABLED: 'nie aktywowano',
-  ERRORS_OF: 'Błędy {0}',
-  DISCONNECT_REASON: 'Przyczyna braku połączenia',
-  ENABLE_MQTT: 'Aktywuj MQTT',
-  BROKER: 'brokera',
-  CLIENT: 'klienta',
-  BASE_TOPIC: 'Prefiks bazowy (unikalny!)',
-  OPTIONAL: 'opcjonalny',
-  FORMATTING: 'Formatowanie',
-  MQTT_FORMAT: 'Sposób publikowania danych',
-  MQTT_NEST_1: 'zagnieżdżone w jednym temacie',
-  MQTT_NEST_2: 'jako oddzielne tematy',
-  MQTT_RESPONSE: 'Rezultat wykonania komendy publikuj w temacie "response"',
-  MQTT_PUBLISH_TEXT_1: 'Tematy z pojedynczą wartością publikuj po jej zmianie',
-  MQTT_PUBLISH_TEXT_2: 'Publikuj w tematach "command" (ioBroker)',
-  MQTT_PUBLISH_TEXT_3: 'Włącz opcję "MQTT discovery" (Home Assistant, Domoticz)',
-  MQTT_PUBLISH_TEXT_4: 'Prefiks dla "MQTT discovery"',
-  MQTT_PUBLISH_INTERVALS: 'Interwały publikowania',
-  MQTT_INT_BOILER: 'Kotły i pompy ciepła',
-  MQTT_INT_THERMOSTATS: 'Termostaty',
-  MQTT_INT_SOLAR: 'Panele solarne',
-  MQTT_INT_MIXER: 'Mieszacze',
-  MQTT_INT_HEARTBEAT: '"Heartbeat" (aktywność)',
-  MQTT_QUEUE: 'Kolejka MQTT',
-  DEFAULT: '{{Pozostałe|Domyślna|}}',
-  MQTT_ENTITY_FORMAT: 'Format "Entity ID"',
-  MQTT_ENTITY_FORMAT_0: 'długa nazwa (jak w v3.4)',
-  MQTT_ENTITY_FORMAT_1: 'krótka nazwa',
-  MQTT_ENTITY_FORMAT_2: 'prefiks bazowy + krótka nazwa',
-  MQTT_CLEAN_SESSION: 'Ustawiaj flagę "Clean session"',
-  MQTT_RETAIN_FLAG: 'Ustawiaj flagę "Retain"',
-  INACTIVE: 'nieaktywn{{y|a|}}',
-  ACTIVE: 'aktywny',
-  UNKNOWN: 'nieznany',
-  SET_TIME: '{{Ustaw zegar|Ustawianie zegara|}}',
-  SET_TIME_TEXT: 'Wprowadź aktualną datę i godzinę',
-  LOCAL_TIME: 'Czas lokalny',
-  UTC_TIME: 'Czas UTC',
-  ENABLE_NTP: 'Aktywuj NTP (data i godzina będą automatycznie synchronizowane z poniższym serwerem czasu)',
-  NTP_SERVER: 'Serwer NTP',
-  TIME_ZONE: 'Strefa czasowa',
-  ACCESS_POINT: '{{Punkt|punktu|}} {{dostępowy|dostępowego|}}',
-  AP_PROVIDE: 'Punkt dostępowy',
-  AP_PROVIDE_TEXT_1: 'zawsze aktywny',
-  AP_PROVIDE_TEXT_2: 'aktywny jeśli brak połączenia z siecią',
-  AP_PROVIDE_TEXT_3: 'nieaktywny',
-  AP_PREFERRED_CHANNEL: 'Preferowany kanał',
-  AP_HIDE_SSID: 'Ukryj SSID',
-  AP_CLIENTS: 'Liczba klientów',
-  AP_MAX_CLIENTS: 'Maksymalna liczba klientów',
-  AP_LOCAL_IP: 'Lokalny adres IP',
-  NETWORK_SCAN: 'Skanowanie sieci WiFi',
-  IDLE: 'bezczynna',
-  LOST: 'zostało utracone.',
-  SCANNING: 'Skanuję',
-  SCAN_AGAIN: 'Skanuj ponownie',
-  NETWORK_SCANNER: 'Skaner sieci WiFi',
-  NETWORK_NO_WIFI: 'Brak sieci WiFi w zasięgu',
-  NETWORK_BLANK_SSID: 'pozostaw puste aby wyłączyć WiFi',
-  TX_POWER: 'Moc nadawania',
-  HOSTNAME: 'Nazwa w sieci',
-  NETWORK_DISABLE_SLEEP: 'Wyłącz tryb usypiania WiFi',
-  NETWORK_LOW_BAND: 'Używaj mniejszej szerokości pasma WiFi (20MHz)',
-  NETWORK_USE_DNS: 'Włącz wsparcie dla mDNS',
-  NETWORK_ENABLE_CORS: 'Włącz wsparcie dla CORS',
-  NETWORK_CORS_ORIGIN: 'CORS origin',
-  NETWORK_ENABLE_IPV6: 'Włącz wsparcie dla IPv6',
-  NETWORK_FIXED_IP: 'Użyj stałego adresu IP',
-  NETWORK_GATEWAY: 'Brama',
-  NETWORK_SUBNET: 'Maska podsieci',
-  NETWORK_DNS: 'Serwery DNS',
-  ADDRESS_OF: 'Adres {0}',
-  ADMIN: 'Użytkownik "administrator".',
-  GUEST: 'Użytkownik "gość".',
-  NEW: 'Nowy',
-  NEW_NAME_OF: 'Nowa nazwa {0}',
-  ENTITY: 'encji',
-  MIN: 'Min.',
-  MAX: 'Maks.'
-};
-
-export default pl;
--- a/interface/src/i18n/sv/index.ts
+++ b/interface/src/i18n/sv/index.ts
@@ -1,310 +0,0 @@
-import type { Translation } from '../i18n-types';
-/* prettier-ignore */
-/* eslint-disable */
-
-const sv: Translation = {
-  LANGUAGE: 'Språk',
-  RETRY: 'Försök igen',
-  LOADING: 'Laddar',
-  IS_REQUIRED: '{0} Krävs',
-  SIGN_IN: 'Logga In',
-  SIGN_OUT: 'Logga Ut',
-  USERNAME: 'Användarnamn',
-  PASSWORD: 'Lösenord',
-  SU_PASSWORD: 'su Lösenord',
-  DASHBOARD: 'Kontrollpanel',
-  SETTINGS_OF: '{0} Inställningar',
-  SAVED: 'Sparat',
-  HELP_OF: '{0} Hjälp',
-  LOGGED_IN: 'Inloggad som {name}',
-  PLEASE_SIGNIN: 'Vänligen logga in för att fortsätta',
-  UPLOAD_SUCCESSFUL: 'Uppladdning lyckades',
-  DOWNLOAD_SUCCESSFUL: 'Nedladdning lyckades',
-  INVALID_LOGIN: 'Ogiltig login',
-  NETWORK: 'Nätverk',
-  SECURITY: 'Säkerhet',
-  ONOFF_CAP: 'PÅ/AV',
-  ONOFF: 'på/av',
-  TYPE: 'Typ',
-  DESCRIPTION: 'Beskrivning',
-  ENTITIES: 'Entiteter',
-  REFRESH: 'Uppdatera',
-  EXPORT: 'Exportera',
-  DEVICE_DETAILS: 'Enhetsdetaljer',
-  ID_OF: '{0}-ID',
-  DEVICE: 'Enhets',
-  PRODUCT: 'Produkt',
-  VERSION: 'Version',
-  BRAND: 'Fabrikat',
-  ENTITY_NAME: 'Entitetsnamn',
-  VALUE: '{{Värde|värde}}',
-  SHOW_FAV: 'Visa enbart favoriter',
-  DEVICE_SENSOR_DATA: 'Enhets och Sensor-data',
-  DEVICES_SENSORS: 'Enheter & Sensorer',
-  ATTACHED_SENSORS: 'Anslutna EMS-ESP Sensorer',
-  RUN_COMMAND: 'Kör Kommando',
-  CHANGE_VALUE: 'Ändra Värde',
-  CANCEL: 'Avbryt',
-  RESET: 'Nollställ',
-  SEND: 'Skicka',
-  SAVE: 'Spara',
-  REMOVE: 'Ta bort',
-  PROBLEM_UPDATING: 'Problem vid uppdatering',
-  PROBLEM_LOADING: 'Problem vid hämtning',
-  ACCESS_DENIED: 'Åtkomst Nekad',
-  ANALOG_SENSOR: 'Analog Sensor',
-  ANALOG_SENSORS: 'Analoga Sensorer',
-  UPDATED_OF: '{0} Uppdaterad',
-  UPDATE_OF: '{0} Uppdatera',
-  REMOVED_OF: '{0} Raderad',
-  DELETION_OF: '{0} Radering',
-  OFFSET: 'Kompensering',
-  FACTOR: 'Faktor',
-  FREQ: 'Frekvens',
-  DUTY_CYCLE: 'Duty Cycle',
-  UNIT: 'UoM',
-  STARTVALUE: 'Startvärde',
-  WARN_GPIO: 'Varning: Var försiktig vid aktivering av GPIO!',
-  EDIT: 'Ändra',
-  SENSOR: 'Sensor',
-  TEMP_SENSOR: 'Temperatursensor',
-  TEMP_SENSORS: 'Temperatursensorer',
-  WRITE_CMD_SENT: 'Skrivkommandon skickade',
-  WRITE_CMD_FAILED: 'Skrivkommandon misslyckade',
-  EMS_BUS_WARNING: 'EMS-buss nedkopplad. Om denna varning kvarstår efter några sekunder, kontrollera inställningar och enhets-profil.',
-  EMS_BUS_SCANNING: 'Söker efter EMS-enheter...',
-  CONNECTED: 'Ansluten',
-  TX_ISSUES: 'Sändfel - Prova ett annat TX-läge',
-  DISCONNECTED: 'Nedkopplad',
-  EMS_SCAN: 'Är du säker att du vill initiera en full genomsökning av EMS-bussen?',
-  EMS_BUS_STATUS: 'Status',
-  ACTIVE_DEVICES: 'Aktiva Enheter',
-  EMS_DEVICE: 'EMS Enhet',
-  SUCCESS: 'Lyckades',
-  FAIL: 'Misslyckades',
-  QUALITY: 'Kvalitet',
-  SCAN_DEVICES: 'Sök efter nya enheter',
-  EMS_BUS_STATUS_TITLE: 'EMS-buss & aktivitetsstatus',
-  SCAN: 'Sök',
-  STATUS_NAMES: [
-    'EMS-telegram (Rx)',
-    'EMS-läsningar (Tx)',
-    'EMS-skrivningar (Tx)',
-    'Temperatursensor-läsningar',
-    'Analog Sensor-läsningar',
-    'MQTT-publiceringar',
-    'API-anrop',
-    'Syslog-meddelanden'
-  ],
-  NUM_DEVICES: '{num} Enhet{{er}}',
-  NUM_TEMP_SENSORS: '{num} Temperatur-sensor{{er}}',
-  NUM_ANALOG_SENSORS: '{num} Analoga Sensor{{er}}',
-  NUM_DAYS: '{num} dag{{ar}}',
-  NUM_SECONDS: '{num} sekund{{er}}',
-  NUM_HOURS: '{num} timmar',
-  NUM_MINUTES: '{num} minut{{er}}',
-  APPLICATION_SETTINGS: 'Inställningar',
-  CUSTOMIZATION: 'Anpassa',
-  APPLICATION_RESTARTING: 'EMS-ESP startar om',
-  INTERFACE_BOARD_PROFILE: 'Interface Hårdvaruprofil',
-  BOARD_PROFILE_TEXT: 'Välj en förkonfigurerad hårdvaruprofil från listan nedan eller välj Anpassad för att konfigurera dina egna hårdvaruinställningar',
-  BOARD_PROFILE: 'Hårdvarutyp',
-  CUSTOM: 'Anpassa',
-  GPIO_OF: '{0} GPIO',
-  BUTTON: 'Knapp',
-  TEMPERATURE: 'Temperatur',
-  PHY_TYPE: 'Eth PHY-typ',
-  DISABLED: 'inaktiverad',
-  TX_MODE: 'Tx-läge',
-  HARDWARE: 'Hårdvara',
-  EMS_BUS: '{{BUSS|EMS-BUSS}}',
-  GENERAL_OPTIONS: 'Allmänna Inställningar',
-  LANGUAGE_ENTITIES: 'Språk (för entiteter)',
-  HIDE_LED: 'Inaktivera LED',
-  ENABLE_TELNET: 'Aktivera Telnet',
-  ENABLE_ANALOG: 'Aktivera Analoga Sensorer',
-  CONVERT_FAHRENHEIT: 'Konvertera temperaturer till Fahrenheit',
-  BYPASS_TOKEN: 'Inaktivera Token-autensiering för API-anrop',
-  READONLY: 'Aktivera read-only (blockerar alla utgående skrivkommandon mot EMS-bussen)',
-  UNDERCLOCK_CPU: 'Nedklocka Processorhastighet',
-  HEATINGOFF: 'Start boiler with forced heating off',
-  ENABLE_SHOWER_TIMER: 'Aktivera Dusch-timer',
-  ENABLE_SHOWER_ALERT: 'Aktivera Dusch-varning',
-  TRIGGER_TIME: 'Aktiveringstid',
-  COLD_SHOT_DURATION: 'Längd på kalldusch',
-  FORMATTING_OPTIONS: 'Formatteringsalternativ',
-  BOOLEAN_FORMAT_DASHBOARD: 'Bool-format Kontrollpanel',
-  BOOLEAN_FORMAT_API: 'Bool-format API/MQTT',
-  ENUM_FORMAT: 'Enum-format API/MQTT',
-  INDEX: 'Index',
-  ENABLE_PARASITE: 'Aktivera parasitström',
-  LOGGING: 'Loggning',
-  LOG_HEX: 'Logga EMS-telegram i hexadecimal',
-  ENABLE_SYSLOG: 'Aktivera Syslog',
-  LOG_LEVEL: 'Loggnivå',
-  MARK_INTERVAL: 'Markerings-interval',
-  SECONDS: 'sekunder',
-  MINUTES: 'minuter',
-  HOURS: 'timmar',
-  RESTART: 'Starta om',
-  RESTART_TEXT: 'EMS-ESP kräver en omstart för att applicera förändrade systeminställningar',
-  RESTART_CONFIRM: 'Är du säker på att du vill starta om EMS-ESP?',
-  COMMAND: 'Kommando',
-  CUSTOMIZATIONS_RESTART: 'Alla anpassningr har raderats. Startar om...',
-  CUSTOMIZATIONS_FULL: 'Antal valda enheter för högt. Vänligen spara i mindre antal åt gången.',
-  CUSTOMIZATIONS_SAVED: 'Anpassningar sparade',
-  CUSTOMIZATIONS_HELP_1: 'Välj en enhet och anpassa underenheter med hjälp av alternativen',
-  CUSTOMIZATIONS_HELP_2: 'Favorit',
-  CUSTOMIZATIONS_HELP_3: 'Inaktivera skrivningar',
-  CUSTOMIZATIONS_HELP_4: 'Exkludera från MQTT & API',
-  CUSTOMIZATIONS_HELP_5: 'Göm från Kontrollpanel',
-  CUSTOMIZATIONS_HELP_6: 'remove from memory',
-  SELECT_DEVICE: 'Välj en enhet',
-  SET_ALL: 'ställ in alla',
-  OPTIONS: 'Alternativ',
-  NAME: 'Namn',
-  CUSTOMIZATIONS_RESET: 'Är du säker på att du vill ta bort alla anpassningar inklusive inställningar för Temperatur och Analoga sensorer?',
-  DEVICE_ENTITIES: 'Enhets-entiteter',
-  USER_CUSTOMIZATION: 'Användaranpassningar',
-  SUPPORT_INFORMATION: 'Supportinformation',
-  CLICK_HERE: 'Klicka Här',
-  HELP_INFORMATION_1: 'Besök Wikin för instruktioner för hur du kan konfigurera EMS-ESP',
-  HELP_INFORMATION_2: 'För community-support besök vår Discord-server',
-  HELP_INFORMATION_3: 'Önska en ny funktion eller rapportera en bugg',
-  HELP_INFORMATION_4: 'Bifoga din systeminformation för snabbare hantering när du rapporterar ett problem',
-  HELP_INFORMATION_5: 'EMS-ESP är gratis och är öppen källkod. Bidra till utvecklingen genom att ge oss en stjärna på GitHub!',
-  SUPPORT_INFO: 'Supportinfo',
-  UPLOAD_OF: '{0} Uppladdning',
-  UPLOAD: 'Uppladdning',
-  DOWNLOAD: 'Nedladdning',
-  ABORTED: 'Avbruten',
-  FAILED: 'Misslyckades',
-  SUCCESSFUL: 'Lyckades',
-  SYSTEM: 'System',
-  LOG_OF: '{0} Logg',
-  STATUS_OF: '{0} Status',
-  UPLOAD_DOWNLOAD: 'Upp/Nedladdning',
-  SYSTEM_VERSION_RUNNING: 'Du använder version',
-  SYSTEM_APPLY_FIRMWARE: 'för att aktivera ny firmware',
-  CLOSE: 'Stäng',
-  USE: 'Använd',
-  FACTORY_RESET: 'Fabriksåterställning',
-  SYSTEM_FACTORY_TEXT: 'Enheten har blivit fabriksåterställd och startar nu om',
-  SYSTEM_FACTORY_TEXT_DIALOG: 'Är du säker att du vill fabriksåterställa enheten?',
-  VERSION_CHECK: 'Senaste versioner',
-  THE_LATEST: 'Den senaste',
-  OFFICIAL: 'officiell',
-  DEVELOPMENT: 'utveckling',
-  VERSION_IS: 'version är',
-  RELEASE_NOTES: 'release-logg',
-  EMS_ESP_VER: 'EMS-ESP Version',
-  PLATFORM: 'Enhet (Plattform / SDK)',
-  UPTIME: 'Systemets Upptid',
-  CPU_FREQ: 'CPU-frekvens',
-  HEAP: 'Heap (Ledigt / Max allokerat)',
-  PSRAM: 'PSRAM (Storlek / Ledigt)',
-  FLASH: 'Flashminne (Storlek / Hastighet)',
-  APPSIZE: 'Applikationer (Använt / Ledigt)',
-  FILESYSTEM: 'Filsystem (Använt / Ledigt)',
-  BUFFER_SIZE: 'Max Bufferstorlek',
-  COMPACT: 'Komprimera',
-  ENABLE_OTA: 'Aktivera OTA-uppdateringar',
-  DOWNLOAD_CUSTOMIZATION_TEXT: 'Ladda ner entitetsanpassningar',
-  DOWNLOAD_SETTINGS_TEXT: 'Ladda ner applikationsinställningar. Var försiktig om du delar dina iställlningar då de innehåller lösenord och annan känslig systeminformation',
-  UPLOAD_TEXT: 'Ladda upp ett nytt firmware (.bin), inställningar eller anpassningar (.json) nedan',
-  UPLOADING: 'Laddar upp',
-  UPLOAD_DROP_TEXT: 'Släpp fil eller klicka här',
-  ERROR: 'Okänt Fel, var god försök igen',
-  TIME_SET: 'Ställ in tid',
-  MANAGE_USERS: 'Användare',
-  IS_ADMIN: 'Admin',
-  USER_WARNING: 'Du måste ha minst en admin konfigurerad',
-  ADD: 'Lägg till',
-  ACCESS_TOKEN_FOR: 'Access Token för',
-  ACCESS_TOKEN_TEXT: 'Nedan Token används med REST API-anrop som kräver auktorisering. Den kan skickas med antingen som en Bearer token i Authorization-headern eller i access_token URL query-parametern.',
-  GENERATING_TOKEN: 'Genererar token',
-  USER: 'Användare',
-  MODIFY: 'Ändra',
-  SU_TEXT: 'SU-användarens (super user) lösenord används för att signera autensierings-tokens samt för att aktivera administratörsprivilegier i Console-läge',
-  NOT_ENABLED: 'Ej aktiv',
-  ERRORS_OF: '{0} fel',
-  DISCONNECT_REASON: 'Anledning till nedkoppling',
-  ENABLE_MQTT: 'Aktivera MQTT',
-  BROKER: 'Broker',
-  CLIENT: 'Client',
-  BASE_TOPIC: 'Base',
-  OPTIONAL: 'Valfritt',
-  FORMATTING: 'Formatering',
-  MQTT_FORMAT: 'Topic/Payload Format',
-  MQTT_NEST_1: 'Nestlat i en topic.',
-  MQTT_NEST_2: 'Som individuella topics',
-  MQTT_RESPONSE: 'Publish-kommando som ett `response` topic',
-  MQTT_PUBLISH_TEXT_1: 'Publicera single value topics vid värdeförändring',
-  MQTT_PUBLISH_TEXT_2: 'Publicera till kommando-topics (ioBroker)',
-  MQTT_PUBLISH_TEXT_3: 'Aktivera MQTT Discovery (Home Assistant, Domoticz)',
-  MQTT_PUBLISH_TEXT_4: 'Prefix för  Discovery topics',
-  MQTT_PUBLISH_INTERVALS: 'Publiceringsintervall',
-  MQTT_INT_BOILER: 'Värmepump/panna',
-  MQTT_INT_THERMOSTATS: 'Termostater',
-  MQTT_INT_SOLAR: 'Solpaneler',
-  MQTT_INT_MIXER: 'Blandningsventiler',
-  MQTT_INT_HEARTBEAT: 'Heartbeat',
-  MQTT_QUEUE: 'MQTT-kö',
-  DEFAULT: 'Standard',
-  MQTT_ENTITY_FORMAT: 'Entitets-ID format',
-  MQTT_ENTITY_FORMAT_0: 'Singel-instans, långt namn(v3.4)',
-  MQTT_ENTITY_FORMAT_1: 'Singel-instans, kort name',
-  MQTT_ENTITY_FORMAT_2: 'Multi-instans, kort name',
-  MQTT_CLEAN_SESSION: 'Använd "Clean Session"-flaggan',
-  MQTT_RETAIN_FLAG: 'Använd "Always Retain"-flaggan',
-  INACTIVE: 'Inaktiv',
-  ACTIVE: 'Aktiv',
-  UNKNOWN: 'Okänt',
-  SET_TIME: 'Ställ in klockan',
-  SET_TIME_TEXT: 'Ange lokal datum och tid nedan för att ställa in klockan',
-  LOCAL_TIME: 'Tid (lokal)',
-  UTC_TIME: 'Tid (UTC)',
-  ENABLE_NTP: 'Aktivera NTP',
-  NTP_SERVER: 'NTP-server',
-  TIME_ZONE: 'Tidszon',
-  ACCESS_POINT: 'Accesspunkt',
-  AP_PROVIDE: 'Aktivera Accesspunkt',
-  AP_PROVIDE_TEXT_1: 'alltid',
-  AP_PROVIDE_TEXT_2: 'när WiFi är nedkopplat',
-  AP_PROVIDE_TEXT_3: 'aldrig',
-  AP_PREFERRED_CHANNEL: 'Kanal',
-  AP_HIDE_SSID: 'Göm SSID',
-  AP_CLIENTS: 'AP-klienter',
-  AP_MAX_CLIENTS: 'Max Klienter',
-  AP_LOCAL_IP: 'Lokalt IP',
-  NETWORK_SCAN: 'Sök efter WiFi-nätverk',
-  IDLE: 'Vilande',
-  LOST: 'Förlorad',
-  SCANNING: 'Söker',
-  SCAN_AGAIN: 'Sök igen',
-  NETWORK_SCANNER: 'Hittade nätverk',
-  NETWORK_NO_WIFI: 'Inga WiFi-nätverk hittades',
-  NETWORK_BLANK_SSID: 'lämna blankt för att inaktivera WiFi',
-  TX_POWER: 'Tx Effekt',
-  HOSTNAME: 'Värdnamn',
-  NETWORK_DISABLE_SLEEP: 'Inaktivera sömnläge',
-  NETWORK_LOW_BAND: 'Använd lägre bandbredd',
-  NETWORK_USE_DNS: 'Aktivera mDNS-tjänsten',
-  NETWORK_ENABLE_CORS: 'Aktivera CORS',
-  NETWORK_CORS_ORIGIN: 'CORS origin',
-  NETWORK_ENABLE_IPV6: 'Aktivera IPv6-support',
-  NETWORK_FIXED_IP: 'Använd statiskt IP',
-  NETWORK_GATEWAY: 'Gateway',
-  NETWORK_SUBNET: 'Subnätmask',
-  NETWORK_DNS: 'DNS-Server',
-  ADDRESS_OF: '{0} Adress',
-  ADMIN: 'Admin',
-  GUEST: 'Gäst',
-  NEW: 'Ny',
-  NEW_NAME_OF: 'Byt namn {0}',
-  ENTITY: 'Entitet',
-  MIN: 'min',
-  MAX: 'max'
-};
-
-export default sv;
--- a/interface/src/index.tsx
+++ b/interface/src/index.tsx
@@ -1,15 +1,15 @@
-import { StrictMode } from 'react';
-import { createRoot } from 'react-dom/client';
+import React from 'react';
+import ReactDOM from 'react-dom';
+
 import { BrowserRouter } from 'react-router-dom';

 import App from './App';

-const root = createRoot(document.getElementById('root') as HTMLElement);
-
-root.render(
-  <StrictMode>
+ReactDOM.render(
+  <React.StrictMode>
    <BrowserRouter>
      <App />
    </BrowserRouter>
-  </StrictMode>
+  </React.StrictMode>,
+  document.getElementById('root')
 );
--- a/interface/src/project/Dashboard.tsx
+++ b/interface/src/project/Dashboard.tsx
@@ -5,21 +5,17 @@ import { Tab } from '@mui/material';

 import { RouterTabs, useRouterTab, useLayoutTitle } from '../components';

-import { useI18nContext } from '../i18n/i18n-react';
-
 import DashboardStatus from './DashboardStatus';
 import DashboardData from './DashboardData';

 const Dashboard: FC = () => {
+  useLayoutTitle('Dashboard');
  const { routerTab } = useRouterTab();

-  const { LL } = useI18nContext();
-  useLayoutTitle(LL.DASHBOARD());
-
  return (
    <>
      <RouterTabs value={routerTab}>
-        <Tab value="data" label={LL.DEVICES_SENSORS()} />
+        <Tab value="data" label="Devices &amp; Sensors" />
        <Tab value="status" label="Status" />
      </RouterTabs>
      <Routes>
--- a/interface/src/project/DashboardData.tsx
+++ b/interface/src/project/DashboardData.tsx
--- a/interface/src/project/DashboardStatus.tsx
+++ b/interface/src/project/DashboardStatus.tsx
@@ -32,13 +32,10 @@ import { ButtonRow, FormLoader, SectionContent } from '../components';

 import { Status, busConnectionStatus, Stat } from './types';

-import { extractErrorMessage, useRest } from '../utils';
+import { formatDurationSec, pluralize, extractErrorMessage, useRest } from '../utils';

 import * as EMSESP from './api';

-import type { Translation } from '../i18n/i18n-types';
-import { useI18nContext } from '../i18n/i18n-react';
-
 export const isConnected = ({ status }: Status) => status !== busConnectionStatus.BUS_STATUS_OFFLINE;

 const busStatusHighlight = ({ status }: Status, theme: Theme) => {
@@ -54,6 +51,19 @@ const busStatusHighlight = ({ status }: Status, theme: Theme) => {
  }
 };

+const busStatus = ({ status }: Status) => {
+  switch (status) {
+    case busConnectionStatus.BUS_STATUS_CONNECTED:
+      return 'Connected';
+    case busConnectionStatus.BUS_STATUS_TX_ERRORS:
+      return 'Tx issues - try a different Tx Mode';
+    case busConnectionStatus.BUS_STATUS_OFFLINE:
+      return 'Disconnected';
+    default:
+      return 'Unknown';
+  }
+};
+
 const showQuality = (stat: Stat) => {
  if (stat.q === 0 || stat.s + stat.f === 0) {
    return;
@@ -71,67 +81,72 @@ const showQuality = (stat: Stat) => {
 const DashboardStatus: FC = () => {
  const { loadData, data, errorMessage } = useRest<Status>({ read: EMSESP.readStatus });

-  const { LL } = useI18nContext();
-
  const theme = useTheme();
  const [confirmScan, setConfirmScan] = useState<boolean>(false);
  const { enqueueSnackbar } = useSnackbar();

  const { me } = useContext(AuthenticatedContext);

-  const showName = (id: any) => {
-    let name: keyof Translation['STATUS_NAMES'] = id;
-    return LL.STATUS_NAMES[name]();
-  };
-
-  const busStatus = ({ status }: Status) => {
-    switch (status) {
-      case busConnectionStatus.BUS_STATUS_CONNECTED:
-        return LL.CONNECTED(0);
-      case busConnectionStatus.BUS_STATUS_TX_ERRORS:
-        return LL.TX_ISSUES();
-      case busConnectionStatus.BUS_STATUS_OFFLINE:
-        return LL.DISCONNECTED();
-      default:
-        return 'Unknown';
-    }
-  };
-
  const stats_theme = tableTheme({
-    Table: `
-      --data-table-library_grid-template-columns: repeat(1, minmax(0, 1fr)) 90px 90px 80px;
-    `,
    BaseRow: `
      font-size: 14px;
+      color: white;
+      height: 32px;
    `,
    HeaderRow: `
      text-transform: uppercase;
      background-color: black;
      color: #90CAF9;
-
-      .th {
-        height: 42px;
-        font-weight: 500;
-        border-bottom: 1px solid #565656;
-      }
+      font-weight: 500;
+      border-bottom: 1px solid #e0e0e0;
+      padding-left: 8px;
    `,
    Row: `
-      .td {
-        padding: 8px;
-        border-top: 1px solid #565656;
-        border-bottom: 1px solid #565656;
-      }
-
-      &:nth-of-type(odd) .td {
+      &:nth-of-type(odd) {
        background-color: #303030;
      }
-      &:nth-of-type(even) .td {
+      &:nth-of-type(even) {
        background-color: #1e1e1e;
      }
+      border-top: 1px solid #565656;
+      border-bottom: 1px solid #565656;
+      position: relative;
+      z-index: 1;
+      &:not(:last-of-type) {
+        margin-bottom: -1px;
+      }
+      &:not(:first-of-type) {
+        margin-top: -1px;
+      }
+      &:hover {
+        color: white;
+      }
    `,
    BaseCell: `
-      &:not(:first-of-type) {
-        text-align: center;
+      border-top: 1px solid transparent;
+      border-right: 1px solid transparent;
+      border-bottom: 1px solid transparent;
+      &:not(.stiff) > div {
+        white-space: nowrap;
+        overflow: hidden;
+        text-overflow: ellipsis;
+      }
+      &:nth-of-type(1) {
+        padding-left: 8px;
+        flex: 1;
+      }
+      &:nth-of-type(2) {
+        width: 70px;
+        text-align: right;
+      }
+      &:nth-of-type(3) {
+        width: 40px;
+        text-align: right;
+      }
+      &:last-of-type {
+        width: 75px;
+        text-align: right;
+        padding-right: 8px;
      }
    `
  });
@@ -147,44 +162,24 @@ const DashboardStatus: FC = () => {
  const scan = async () => {
    try {
      await EMSESP.scanDevices();
-      enqueueSnackbar(LL.SCANNING() + '...', { variant: 'info' });
-    } catch (error) {
-      enqueueSnackbar(extractErrorMessage(error, LL.PROBLEM_UPDATING()), { variant: 'error' });
+      enqueueSnackbar('Scanning for devices...', { variant: 'info' });
+    } catch (error: unknown) {
+      enqueueSnackbar(extractErrorMessage(error, 'Problem initiating scan'), { variant: 'error' });
    } finally {
      setConfirmScan(false);
    }
  };

-  const formatDurationSec = (duration_sec: number) => {
-    const days = Math.trunc((duration_sec * 1000) / 86400000);
-    const hours = Math.trunc((duration_sec * 1000) / 3600000) % 24;
-    const minutes = Math.trunc((duration_sec * 1000) / 60000) % 60;
-    const seconds = Math.trunc((duration_sec * 1000) / 1000) % 60;
-
-    let formatted = '';
-    if (days) {
-      formatted += LL.NUM_DAYS({ num: days }) + ' ';
-    }
-    if (hours) {
-      formatted += LL.NUM_HOURS({ num: hours }) + ' ';
-    }
-    if (minutes) {
-      formatted += LL.NUM_MINUTES({ num: minutes }) + ' ';
-    }
-    formatted += LL.NUM_SECONDS({ num: seconds });
-    return formatted;
-  };
-
  const renderScanDialog = () => (
    <Dialog open={confirmScan} onClose={() => setConfirmScan(false)}>
-      <DialogTitle>{LL.SCAN_DEVICES()}</DialogTitle>
-      <DialogContent dividers>{LL.EMS_SCAN()}</DialogContent>
+      <DialogTitle>EMS Device Scan</DialogTitle>
+      <DialogContent dividers>Are you sure you want to initiate a full device scan of the EMS bus?</DialogContent>
      <DialogActions>
        <Button startIcon={<CancelIcon />} variant="outlined" onClick={() => setConfirmScan(false)} color="secondary">
-          {LL.CANCEL()}
+          Cancel
        </Button>
        <Button startIcon={<PermScanWifiIcon />} variant="outlined" onClick={scan} color="primary" autoFocus>
-          {LL.SCAN()}
+          Scan
        </Button>
      </DialogActions>
    </Dialog>
@@ -204,10 +199,7 @@ const DashboardStatus: FC = () => {
                <DirectionsBusIcon />
              </Avatar>
            </ListItemAvatar>
-            <ListItemText
-              primary={LL.EMS_BUS_STATUS()}
-              secondary={busStatus(data) + ' (' + formatDurationSec(data.uptime) + ')'}
-            />
+            <ListItemText primary="EMS Bus Status" secondary={busStatus(data) + formatDurationSec(data.uptime)} />
          </ListItem>
          <ListItem>
            <ListItemAvatar>
@@ -216,13 +208,13 @@ const DashboardStatus: FC = () => {
              </Avatar>
            </ListItemAvatar>
            <ListItemText
-              primary={LL.ACTIVE_DEVICES()}
+              primary="Active Devices &amp; Sensors"
              secondary={
-                LL.NUM_DEVICES({ num: data.num_devices }) +
+                pluralize(data.num_devices, 'EMS Device') +
                ', ' +
-                LL.NUM_TEMP_SENSORS({ num: data.num_sensors }) +
+                pluralize(data.num_sensors, 'Temperature Sensor') +
                ', ' +
-                LL.NUM_ANALOG_SENSORS({ num: data.num_analogs })
+                pluralize(data.num_analogs, 'Analog Sensor')
              }
            />
          </ListItem>
@@ -232,19 +224,19 @@ const DashboardStatus: FC = () => {
              <>
                <Header>
                  <HeaderRow>
-                    <HeaderCell resize></HeaderCell>
-                    <HeaderCell stiff>{LL.SUCCESS()}</HeaderCell>
-                    <HeaderCell stiff>{LL.FAIL()}</HeaderCell>
-                    <HeaderCell stiff>{LL.QUALITY()}</HeaderCell>
+                    <HeaderCell></HeaderCell>
+                    <HeaderCell>SUCCESS</HeaderCell>
+                    <HeaderCell>FAIL</HeaderCell>
+                    <HeaderCell>QUALITY</HeaderCell>
                  </HeaderRow>
                </Header>
                <Body>
                  {tableList.map((stat: Stat) => (
                    <Row key={stat.id} item={stat}>
-                      <Cell>{showName(stat.id)}</Cell>
-                      <Cell stiff>{Intl.NumberFormat().format(stat.s)}</Cell>
-                      <Cell stiff>{Intl.NumberFormat().format(stat.f)}</Cell>
-                      <Cell stiff>{showQuality(stat)}</Cell>
+                      <Cell>{stat.id}</Cell>
+                      <Cell>{Intl.NumberFormat().format(stat.s)}</Cell>
+                      <Cell>{Intl.NumberFormat().format(stat.f)}</Cell>
+                      <Cell>{showQuality(stat)}</Cell>
                    </Row>
                  ))}
                </Body>
@@ -256,7 +248,7 @@ const DashboardStatus: FC = () => {
        <Box display="flex" flexWrap="wrap">
          <Box flexGrow={1} sx={{ '& button': { mt: 2 } }}>
            <Button startIcon={<RefreshIcon />} variant="outlined" color="secondary" onClick={loadData}>
-              {LL.REFRESH()}
+              Refresh
            </Button>
          </Box>
          <Box flexWrap="nowrap" whiteSpace="nowrap">
@@ -268,7 +260,7 @@ const DashboardStatus: FC = () => {
                disabled={!me.admin}
                onClick={() => setConfirmScan(true)}
              >
-                {LL.SCAN_DEVICES()}
+                Scan for new devices
              </Button>
            </ButtonRow>
          </Box>
@@ -278,7 +270,7 @@ const DashboardStatus: FC = () => {
  };

  return (
-    <SectionContent title={LL.EMS_BUS_STATUS_TITLE()} titleGutter>
+    <SectionContent title="EMS Bus &amp; Activity Status" titleGutter>
      {content()}
    </SectionContent>
  );
--- a/interface/src/project/DeviceIcon.tsx
+++ b/interface/src/project/DeviceIcon.tsx
@@ -9,61 +9,31 @@ import { GiHeatHaze } from 'react-icons/gi';
 import { TiFlowSwitch } from 'react-icons/ti';
 import { VscVmConnect } from 'react-icons/vsc';
 import { AiOutlineGateway } from 'react-icons/ai';
-import { AiOutlineAlert } from 'react-icons/ai';
-import { AiOutlineChrome } from 'react-icons/ai';

 interface DeviceIconProps {
-  type_id: number;
+  type: string;
 }

-// matches emsdevice.h DeviceType
-const enum DeviceType {
-  SYSTEM = 0,
-  DALLASSENSOR,
-  ANALOGSENSOR,
-  BOILER,
-  THERMOSTAT,
-  MIXER,
-  SOLAR,
-  HEATPUMP,
-  GATEWAY,
-  SWITCH,
-  CONTROLLER,
-  CONNECT,
-  ALERT,
-  PUMP,
-  GENERIC,
-  HEATSOURCE,
-  UNKNOWN
-}
-
-const DeviceIcon: FC<DeviceIconProps> = ({ type_id }) => {
-  switch (type_id) {
-    case DeviceType.DALLASSENSOR:
-    case DeviceType.ANALOGSENSOR:
-      return <MdOutlineSensors />;
-    case DeviceType.BOILER:
-    case DeviceType.HEATSOURCE:
+const DeviceIcon: FC<DeviceIconProps> = ({ type }) => {
+  switch (type) {
+    case 'Boiler':
      return <CgSmartHomeBoiler />;
-    case DeviceType.THERMOSTAT:
-      return <MdThermostatAuto />;
-    case DeviceType.MIXER:
-      return <AiOutlineControl />;
-    case DeviceType.SOLAR:
+    case 'Sensor':
+      return <MdOutlineSensors />;
+    case 'Solar':
      return <FaSolarPanel />;
-    case DeviceType.HEATPUMP:
+    case 'Thermostat':
+      return <MdThermostatAuto />;
+    case 'Mixer':
+      return <AiOutlineControl />;
+    case 'Heatpump':
      return <GiHeatHaze />;
-    case DeviceType.GATEWAY:
-      return <AiOutlineGateway />;
-    case DeviceType.SWITCH:
+    case 'Switch':
      return <TiFlowSwitch />;
-    case DeviceType.CONTROLLER:
-    case DeviceType.CONNECT:
+    case 'Connect':
      return <VscVmConnect />;
-    case DeviceType.ALERT:
-      return <AiOutlineAlert />;
-    case DeviceType.PUMP:
-      return <AiOutlineChrome />;
+    case 'Gateway':
+      return <AiOutlineGateway />;
    default:
      return null;
  }
--- a/interface/src/project/Help.tsx
+++ b/interface/src/project/Help.tsx
@@ -5,20 +5,16 @@ import { Tab } from '@mui/material';

 import { RouterTabs, useRouterTab, useLayoutTitle } from '../components';

-import { useI18nContext } from '../i18n/i18n-react';
-
 import HelpInformation from './HelpInformation';

 const Help: FC = () => {
-  const { LL } = useI18nContext();
+  useLayoutTitle('Help');
  const { routerTab } = useRouterTab();

-  useLayoutTitle(LL.HELP_OF(''));
-
  return (
    <>
      <RouterTabs value={routerTab}>
-        <Tab value="information" label={LL.HELP_OF('EMS-ESP')} />
+        <Tab value="information" label="EMS-ESP Help" />
      </RouterTabs>
      <Routes>
        <Route path="information" element={<HelpInformation />} />
--- a/interface/src/project/HelpInformation.tsx
+++ b/interface/src/project/HelpInformation.tsx
@@ -1,31 +1,32 @@
-import { FC } from 'react';
+import { FC, useContext } from 'react';

 import { Typography, Button, Box, List, ListItem, ListItemText, Link, ListItemAvatar } from '@mui/material';

-import { SectionContent } from '../components';
+import { SectionContent, ButtonRow, MessageBox } from '../components';
+
+import { AuthenticatedContext } from '../contexts/authentication';

 import { useSnackbar } from 'notistack';

 import CommentIcon from '@mui/icons-material/CommentTwoTone';
 import MenuBookIcon from '@mui/icons-material/MenuBookTwoTone';
 import GitHubIcon from '@mui/icons-material/GitHub';
+import StarIcon from '@mui/icons-material/Star';
 import DownloadIcon from '@mui/icons-material/GetApp';
-import EastIcon from '@mui/icons-material/East';
+import TuneIcon from '@mui/icons-material/Tune';

 import { extractErrorMessage } from '../utils';

-import { useI18nContext } from '../i18n/i18n-react';
-
 import * as EMSESP from './api';

 const HelpInformation: FC = () => {
-  const { LL } = useI18nContext();
-
  const { enqueueSnackbar } = useSnackbar();

+  const { me } = useContext(AuthenticatedContext);
+
  const saveFile = (json: any, endpoint: string) => {
    const a = document.createElement('a');
-    const filename = 'emsesp_' + endpoint + '.txt';
+    const filename = 'emsesp_' + endpoint + '.json';
    a.href = URL.createObjectURL(
      new Blob([JSON.stringify(json, null, 2)], {
        type: 'text/plain'
@@ -35,7 +36,7 @@ const HelpInformation: FC = () => {
    document.body.appendChild(a);
    a.click();
    document.body.removeChild(a);
-    enqueueSnackbar(LL.DOWNLOAD_SUCCESSFUL(), { variant: 'info' });
+    enqueueSnackbar('File downloaded', { variant: 'info' });
  };

  const callAPI = async (endpoint: string) => {
@@ -46,83 +47,151 @@ const HelpInformation: FC = () => {
        id: 0
      });
      if (response.status !== 200) {
-        enqueueSnackbar(LL.PROBLEM_LOADING(), { variant: 'error' });
+        enqueueSnackbar('API call failed', { variant: 'error' });
      } else {
        saveFile(response.data, endpoint);
      }
-    } catch (error) {
-      enqueueSnackbar(extractErrorMessage(error, LL.PROBLEM_LOADING()), { variant: 'error' });
+    } catch (error: unknown) {
+      enqueueSnackbar(extractErrorMessage(error, 'Problem with downloading'), { variant: 'error' });
+    }
+  };
+
+  const downloadSettings = async () => {
+    try {
+      const response = await EMSESP.getSettings();
+      if (response.status !== 200) {
+        enqueueSnackbar('Unable to get settings', { variant: 'error' });
+      } else {
+        saveFile(response.data, 'settings');
+      }
+    } catch (error: unknown) {
+      enqueueSnackbar(extractErrorMessage(error, 'Problem with downloading'), { variant: 'error' });
+    }
+  };
+
+  const downloadCustomizations = async () => {
+    try {
+      const response = await EMSESP.getCustomizations();
+      if (response.status !== 200) {
+        enqueueSnackbar('Unable to get customizations', { variant: 'error' });
+      } else {
+        saveFile(response.data, 'customizations');
+      }
+    } catch (error: unknown) {
+      enqueueSnackbar(extractErrorMessage(error, 'Problem with downloading'), { variant: 'error' });
    }
  };

  return (
-    <SectionContent title={LL.SUPPORT_INFORMATION()} titleGutter>
+    <SectionContent title="Application Information &amp; Support" titleGutter>
      <List>
        <ListItem>
          <ListItemAvatar>
-            <MenuBookIcon style={{ fontSize: 24, color: 'lightblue', verticalAlign: 'middle' }} />
+            <TuneIcon />
          </ListItemAvatar>
          <ListItemText>
-            {LL.HELP_INFORMATION_1()}&nbsp;
-            <EastIcon style={{ fontSize: 24, color: 'lightblue', verticalAlign: 'middle' }} />
-            &nbsp;
-            <Link target="_blank" href="https://emsesp.github.io/docs" color="primary">
-              {LL.CLICK_HERE()}
-            </Link>
-          </ListItemText>
-        </ListItem>
-
-        <ListItem>
-          <ListItemAvatar>
-            <CommentIcon style={{ fontSize: 24, color: 'lightblue', verticalAlign: 'middle' }} />
-          </ListItemAvatar>
-          <ListItemText>
-            {LL.HELP_INFORMATION_2()}&nbsp;
-            <EastIcon style={{ fontSize: 24, color: 'lightblue', verticalAlign: 'middle' }} />
-            &nbsp;
-            <Link target="_blank" href="https://discord.gg/3J3GgnzpyT" color="primary">
-              {LL.CLICK_HERE()}
-            </Link>
-          </ListItemText>
-        </ListItem>
-
-        <ListItem>
-          <ListItemAvatar>
-            <GitHubIcon style={{ fontSize: 24, color: 'lightblue', verticalAlign: 'middle' }} />
-          </ListItemAvatar>
-          <ListItemText>
-            {LL.HELP_INFORMATION_3()}&nbsp;
-            <EastIcon style={{ fontSize: 24, color: 'lightblue', verticalAlign: 'middle' }} />
-            <Link target="_blank" href="https://github.com/emsesp/EMS-ESP32/issues/new/choose" color="primary">
-              {LL.CLICK_HERE()}
-            </Link>
-            <br />
-            <i>({LL.HELP_INFORMATION_4()}</i>&nbsp;&nbsp;
-            <Button
-              startIcon={<DownloadIcon />}
-              size="small"
-              variant="outlined"
+            For a help on each of the Application Settings see&nbsp;
+            <Link
+              target="_blank"
+              href="https://emsesp.github.io/docs/#/Configure-firmware?id=ems-esp-settings"
              color="primary"
-              onClick={() => callAPI('info')}
            >
-              {LL.SUPPORT_INFO()}
-            </Button>
-            &nbsp;)
+              {'Configuring EMS-ESP'}
+            </Link>
+          </ListItemText>
+        </ListItem>
+
+        <ListItem>
+          <ListItemAvatar>
+            <MenuBookIcon />
+          </ListItemAvatar>
+          <ListItemText>
+            For general information about EMS-ESP visit the online&nbsp;
+            <Link target="_blank" href="https://emsesp.github.io/docs" color="primary">
+              {'Documentation'}
+            </Link>
+          </ListItemText>
+        </ListItem>
+
+        <ListItem>
+          <ListItemAvatar>
+            <CommentIcon />
+          </ListItemAvatar>
+          <ListItemText>
+            For live community chat join our&nbsp;
+            <Link target="_blank" href="https://discord.gg/3J3GgnzpyT" color="primary">
+              {'Discord'}
+            </Link>
+            &nbsp;server
+          </ListItemText>
+        </ListItem>
+
+        <ListItem>
+          <ListItemAvatar>
+            <GitHubIcon />
+          </ListItemAvatar>
+          <ListItemText>
+            To report an issue or request a feature, please&nbsp;
+            <Link component="button" variant="body1" onClick={() => callAPI('info')}>
+              download
+            </Link>
+            &nbsp;the debug information and include in a new&nbsp;
+            <Link target="_blank" href="https://github.com/emsesp/EMS-ESP32/issues/new/choose" color="primary">
+              GitHub issue
+            </Link>
          </ListItemText>
        </ListItem>
      </List>

-      <Box border={1} p={1} mt={4} color="orange">
-        <Typography align="center" variant="subtitle1" color="orange">
-          <b>{LL.HELP_INFORMATION_5()}</b>
-        </Typography>
-        <Typography align="center">
-          <Link target="_blank" href="https://github.com/emsesp/EMS-ESP32" color="primary">
-            {'github.com/emsesp/EMS-ESP32'}
+      {me.admin && (
+        <>
+          <Typography sx={{ pt: 2, pb: 2 }} variant="h6" color="primary">
+            Download Settings
+          </Typography>
+          <Box color="warning.main">
+            <Typography variant="body2">
+              Export the application settings and any customizations to a JSON file. These files can later be uploaded
+              via System&rarr;Upload.
+            </Typography>
+          </Box>
+          <Box sx={{ display: 'flex' }}>
+            <ButtonRow>
+              <Button
+                startIcon={<DownloadIcon />}
+                variant="outlined"
+                color="primary"
+                onClick={() => downloadSettings()}
+              >
+                settings
+              </Button>
+              <Button
+                startIcon={<DownloadIcon />}
+                variant="outlined"
+                color="primary"
+                onClick={() => downloadCustomizations()}
+              >
+                customizations
+              </Button>
+            </ButtonRow>
+          </Box>
+          <MessageBox
+            my={2}
+            level="warning"
+            message="Be careful when sharing your Settings as the file contains passwords and other sensitive system
+              information!"
+          />
+        </>
+      )}
+
+      <Box bgcolor="secondary.info" border={1} p={1} mt={4}>
+        <Typography align="center" variant="h6">
+          EMS-ESP is a free and open-source project.
+          <br></br>Please consider supporting us by giving it a&nbsp;
+          <StarIcon style={{ fontSize: 16, color: '#fdff3a', verticalAlign: 'middle' }} /> on&nbsp;
+          <Link href="https://github.com/emsesp/EMS-ESP32" color="primary">
+            {'GitHub'}
          </Link>
-        </Typography>
-        <Typography color="white" align="center">
-          @proddy @MichaelDvP
+          &nbsp;!
        </Typography>
      </Box>
    </SectionContent>
--- a/interface/src/project/OptionIcon.tsx
+++ b/interface/src/project/OptionIcon.tsx
@@ -1,43 +0,0 @@
-import { FC } from 'react';
-import { SvgIconProps } from '@mui/material';
-
-import EditOutlinedIcon from '@mui/icons-material/EditOutlined';
-import EditOffOutlinedIcon from '@mui/icons-material/EditOffOutlined';
-
-import StarIcon from '@mui/icons-material/Star';
-import StarOutlineIcon from '@mui/icons-material/StarOutline';
-
-import VisibilityOffOutlinedIcon from '@mui/icons-material/VisibilityOffOutlined';
-import VisibilityOutlinedIcon from '@mui/icons-material/VisibilityOutlined';
-
-import CommentsDisabledOutlinedIcon from '@mui/icons-material/CommentsDisabledOutlined';
-import InsertCommentOutlinedIcon from '@mui/icons-material/InsertCommentOutlined';
-
-import DeleteOutlineIcon from '@mui/icons-material/DeleteOutline';
-import DeleteForeverIcon from '@mui/icons-material/DeleteForever';
-
-type OptionType = 'deleted' | 'readonly' | 'web_exclude' | 'api_mqtt_exclude' | 'favorite';
-
-const OPTION_ICONS: { [type in OptionType]: [React.ComponentType<SvgIconProps>, React.ComponentType<SvgIconProps>] } = {
-  deleted: [DeleteForeverIcon, DeleteOutlineIcon],
-  readonly: [EditOffOutlinedIcon, EditOutlinedIcon],
-  web_exclude: [VisibilityOffOutlinedIcon, VisibilityOutlinedIcon],
-  api_mqtt_exclude: [CommentsDisabledOutlinedIcon, InsertCommentOutlinedIcon],
-  favorite: [StarIcon, StarOutlineIcon]
-};
-
-interface OptionIconProps {
-  type: OptionType;
-  isSet: boolean;
-}
-
-const OptionIcon: FC<OptionIconProps> = ({ type, isSet }) => {
-  const Icon = OPTION_ICONS[type][isSet ? 0 : 1];
-  return isSet ? (
-    <Icon color="primary" sx={{ fontSize: 14, verticalAlign: 'middle' }} />
-  ) : (
-    <Icon sx={{ fontSize: 14, verticalAlign: 'middle' }} />
-  );
-};
-
-export default OptionIcon;
--- a/interface/src/project/ProjectMenu.tsx
+++ b/interface/src/project/ProjectMenu.tsx
@@ -6,8 +6,6 @@ import { AuthenticatedContext } from '../contexts/authentication';

 import { PROJECT_PATH } from '../api/env';

-import { useI18nContext } from '../i18n/i18n-react';
-
 import TuneIcon from '@mui/icons-material/Tune';
 import DashboardIcon from '@mui/icons-material/Dashboard';
 import LayoutMenuItem from '../components/layout/LayoutMenuItem';
@@ -15,18 +13,17 @@ import InfoIcon from '@mui/icons-material/Info';

 const ProjectMenu: FC = () => {
  const authenticatedContext = useContext(AuthenticatedContext);
-  const { LL } = useI18nContext();

  return (
    <List>
-      <LayoutMenuItem icon={DashboardIcon} label={LL.DASHBOARD()} to={`/${PROJECT_PATH}/dashboard`} />
+      <LayoutMenuItem icon={DashboardIcon} label="Dashboard" to={`/${PROJECT_PATH}/dashboard`} />
      <LayoutMenuItem
        icon={TuneIcon}
-        label={LL.SETTINGS_OF('')}
+        label="Settings"
        to={`/${PROJECT_PATH}/settings`}
        disabled={!authenticatedContext.me.admin}
      />
-      <LayoutMenuItem icon={InfoIcon} label={LL.HELP_OF('')} to={`/${PROJECT_PATH}/help`} />
+      <LayoutMenuItem icon={InfoIcon} label="Help" to={`/${PROJECT_PATH}/help`} />
    </List>
  );
 };
--- a/interface/src/project/Settings.tsx
+++ b/interface/src/project/Settings.tsx
@@ -5,22 +5,18 @@ import { Tab } from '@mui/material';

 import { RouterTabs, useRouterTab, useLayoutTitle } from '../components';

-import { useI18nContext } from '../i18n/i18n-react';
-
 import SettingsApplication from './SettingsApplication';
 import SettingsCustomization from './SettingsCustomization';

 const Settings: FC = () => {
-  const { LL } = useI18nContext();
+  useLayoutTitle('Settings');
  const { routerTab } = useRouterTab();

-  useLayoutTitle(LL.SETTINGS_OF(''));
-
  return (
    <>
      <RouterTabs value={routerTab}>
-        <Tab value="application" label={LL.APPLICATION_SETTINGS()} />
-        <Tab value="customization" label={LL.CUSTOMIZATION()} />
+        <Tab value="application" label="Application Settings" />
+        <Tab value="customization" label="Customization" />
      </RouterTabs>
      <Routes>
        <Route path="application" element={<SettingsApplication />} />
--- a/interface/src/project/SettingsApplication.tsx
+++ b/interface/src/project/SettingsApplication.tsx
@@ -3,7 +3,7 @@ import { ValidateFieldsError } from 'async-validator';

 import { useSnackbar } from 'notistack';

-import { Box, Button, Checkbox, MenuItem, Grid, Typography, Divider, InputAdornment } from '@mui/material';
+import { Box, Button, Checkbox, MenuItem, Grid, Typography, Divider } from '@mui/material';

 import SaveIcon from '@mui/icons-material/Save';
 import PowerSettingsNewIcon from '@mui/icons-material/PowerSettingsNew';
@@ -24,9 +24,6 @@ import { numberValue, extractErrorMessage, updateValue, useRest } from '../utils
 import * as EMSESP from './api';
 import { Settings, BOARD_PROFILES } from './types';

-import { useI18nContext } from '../i18n/i18n-react';
-import RestartMonitor from '../framework/system/RestartMonitor';
-
 export function boardProfileSelectItems() {
  return Object.keys(BOARD_PROFILES).map((code) => (
    <MenuItem key={code} value={code}>
@@ -40,9 +37,6 @@ const SettingsApplication: FC = () => {
    read: EMSESP.readSettings,
    update: EMSESP.writeSettings
  });
-  const [restarting, setRestarting] = useState<boolean>();
-
-  const { LL } = useI18nContext();

  const { enqueueSnackbar } = useSnackbar();

@@ -70,8 +64,8 @@ const SettingsApplication: FC = () => {
          eth_clock_mode: response.data.eth_clock_mode
        });
      }
-    } catch (error) {
-      enqueueSnackbar(extractErrorMessage(error, LL.PROBLEM_UPDATING()), { variant: 'error' });
+    } catch (error: unknown) {
+      enqueueSnackbar(extractErrorMessage(error, 'Problem fetching board profile'), { variant: 'error' });
    } finally {
      setProcessingBoard(false);
    }
@@ -108,26 +102,28 @@ const SettingsApplication: FC = () => {
      validateAndSubmit();
      try {
        await EMSESP.restart();
-        setRestarting(true);
-      } catch (error) {
-        enqueueSnackbar(extractErrorMessage(error, LL.PROBLEM_UPDATING()), { variant: 'error' });
+        enqueueSnackbar('EMS-ESP is restarting...', { variant: 'info' });
+      } catch (error: unknown) {
+        enqueueSnackbar(extractErrorMessage(error, 'Problem restarting device'), { variant: 'error' });
      }
    };

    return (
      <>
        <Typography sx={{ pt: 2 }} variant="h6" color="primary">
-          {LL.INTERFACE_BOARD_PROFILE()}
+          Interface Board Profile
        </Typography>
        <Box color="warning.main">
-          <Typography variant="body2">{LL.BOARD_PROFILE_TEXT()}</Typography>
+          <Typography variant="body2">
+            Select a pre-configured interface board profile from the list below or choose "Custom" to configure your own
+            hardware settings.
+          </Typography>
        </Box>
        <ValidatedTextField
          name="board_profile"
-          label={LL.BOARD_PROFILE()}
+          label="Board Profile"
          value={data.board_profile}
          disabled={processingBoard}
-          fullWidth
          variant="outlined"
          onChange={changeBoardProfile}
          margin="normal"
@@ -136,24 +132,17 @@ const SettingsApplication: FC = () => {
          {boardProfileSelectItems()}
          <Divider />
          <MenuItem key={'CUSTOM'} value={'CUSTOM'}>
-            {LL.CUSTOM()}&hellip;
+            Custom&hellip;
          </MenuItem>
        </ValidatedTextField>
        {data.board_profile === 'CUSTOM' && (
          <>
-            <Grid
-              container
-              spacing={1}
-              sx={{ pt: 1 }}
-              direction="row"
-              justifyContent="flex-start"
-              alignItems="flex-start"
-            >
-              <Grid item xs={6} sm={4}>
+            <Grid container spacing={1} direction="row" justifyContent="flex-start" alignItems="flex-start">
+              <Grid item xs={4}>
                <ValidatedTextField
                  fieldErrors={fieldErrors}
                  name="rx_gpio"
-                  label={LL.GPIO_OF('Rx')}
+                  label="Rx GPIO"
                  fullWidth
                  variant="outlined"
                  value={numberValue(data.rx_gpio)}
@@ -163,11 +152,11 @@ const SettingsApplication: FC = () => {
                  disabled={saving}
                />
              </Grid>
-              <Grid item xs={6} sm={4}>
+              <Grid item xs={4}>
                <ValidatedTextField
                  fieldErrors={fieldErrors}
                  name="tx_gpio"
-                  label={LL.GPIO_OF('Tx')}
+                  label="Tx GPIO"
                  fullWidth
                  variant="outlined"
                  value={numberValue(data.tx_gpio)}
@@ -177,11 +166,11 @@ const SettingsApplication: FC = () => {
                  disabled={saving}
                />
              </Grid>
-              <Grid item xs={6} sm={4}>
+              <Grid item xs={4}>
                <ValidatedTextField
                  fieldErrors={fieldErrors}
                  name="pbutton_gpio"
-                  label={LL.GPIO_OF(LL.BUTTON())}
+                  label="Button GPIO"
                  fullWidth
                  variant="outlined"
                  value={numberValue(data.pbutton_gpio)}
@@ -191,11 +180,11 @@ const SettingsApplication: FC = () => {
                  disabled={saving}
                />
              </Grid>
-              <Grid item xs={6} sm={4}>
+              <Grid item>
                <ValidatedTextField
                  fieldErrors={fieldErrors}
                  name="dallas_gpio"
-                  label={LL.GPIO_OF(LL.TEMPERATURE()) + ' (0=' + LL.DISABLED(1) + ')'}
+                  label="Temperature GPIO (0=disabled)"
                  fullWidth
                  variant="outlined"
                  value={numberValue(data.dallas_gpio)}
@@ -205,11 +194,11 @@ const SettingsApplication: FC = () => {
                  disabled={saving}
                />
              </Grid>
-              <Grid item xs={6} sm={4}>
+              <Grid item>
                <ValidatedTextField
                  fieldErrors={fieldErrors}
                  name="led_gpio"
-                  label={LL.GPIO_OF('LED') + ' (0=' + LL.DISABLED(1) + ')'}
+                  label="LED GPIO (0=disabled)"
                  fullWidth
                  variant="outlined"
                  value={numberValue(data.led_gpio)}
@@ -219,37 +208,30 @@ const SettingsApplication: FC = () => {
                  disabled={saving}
                />
              </Grid>
-              <Grid item xs={6} sm={4}>
-                <ValidatedTextField
-                  name="phy_type"
-                  label={LL.PHY_TYPE()}
-                  disabled={saving}
-                  value={data.phy_type}
-                  fullWidth
-                  variant="outlined"
-                  onChange={updateFormValue}
-                  margin="normal"
-                  select
-                >
-                  <MenuItem value={0}>{LL.DISABLED(1)}</MenuItem>
-                  <MenuItem value={1}>LAN8720</MenuItem>
-                  <MenuItem value={2}>TLK110</MenuItem>
-                </ValidatedTextField>
-              </Grid>
+            </Grid>
+            <Grid item xs={4}>
+              <ValidatedTextField
+                name="phy_type"
+                label="Eth PHY Type"
+                disabled={saving}
+                value={data.phy_type}
+                fullWidth
+                variant="outlined"
+                onChange={updateFormValue}
+                margin="normal"
+                select
+              >
+                <MenuItem value={0}>No Ethernet Module</MenuItem>
+                <MenuItem value={1}>LAN8720</MenuItem>
+                <MenuItem value={2}>TLK110</MenuItem>
+              </ValidatedTextField>
            </Grid>
            {data.phy_type !== 0 && (
-              <Grid
-                container
-                spacing={1}
-                sx={{ pt: 1 }}
-                direction="row"
-                justifyContent="flex-start"
-                alignItems="flex-start"
-              >
-                <Grid item xs={6} sm={4}>
+              <Grid container spacing={1} direction="row" justifyContent="flex-start" alignItems="flex-start">
+                <Grid item>
                  <ValidatedTextField
                    name="eth_power"
-                    label={LL.GPIO_OF('PHY Power') + ' (-1=' + LL.DISABLED(1) + ')'}
+                    label="Eth Power GPIO (-1=disabled)"
                    fullWidth
                    variant="outlined"
                    value={numberValue(data.eth_power)}
@@ -259,10 +241,10 @@ const SettingsApplication: FC = () => {
                    disabled={saving}
                  />
                </Grid>
-                <Grid item xs={6} sm={4}>
+                <Grid item>
                  <ValidatedTextField
                    name="eth_phy_addr"
-                    label={LL.ADDRESS_OF('PHY I²C')}
+                    label="Eth I²C-address"
                    fullWidth
                    variant="outlined"
                    value={numberValue(data.eth_phy_addr)}
@@ -272,10 +254,10 @@ const SettingsApplication: FC = () => {
                    disabled={saving}
                  />
                </Grid>
-                <Grid item xs={6} sm={4}>
+                <Grid item>
                  <ValidatedTextField
                    name="eth_clock_mode"
-                    label="PHY Clk"
+                    label="Eth Clock Mode"
                    disabled={saving}
                    value={data.eth_clock_mode}
                    fullWidth
@@ -294,14 +276,14 @@ const SettingsApplication: FC = () => {
            )}
          </>
        )}
-        <Typography sx={{ pt: 2 }} variant="h6" color="primary">
-          {LL.SETTINGS_OF(LL.EMS_BUS(0))}
+        <Typography variant="h6" color="primary">
+          EMS Bus Settings
        </Typography>
        <Grid container spacing={1} direction="row" justifyContent="flex-start" alignItems="flex-start">
          <Grid item xs={6}>
            <ValidatedTextField
              name="tx_mode"
-              label={LL.TX_MODE()}
+              label="Tx Mode"
              disabled={saving}
              value={data.tx_mode}
              fullWidth
@@ -313,13 +295,13 @@ const SettingsApplication: FC = () => {
              <MenuItem value={1}>EMS</MenuItem>
              <MenuItem value={2}>EMS+</MenuItem>
              <MenuItem value={3}>HT3</MenuItem>
-              <MenuItem value={4}>{LL.HARDWARE()}</MenuItem>
+              <MenuItem value={4}>Hardware</MenuItem>
            </ValidatedTextField>
          </Grid>
          <Grid item xs={6}>
            <ValidatedTextField
              name="ems_bus_id"
-              label={LL.ID_OF(LL.EMS_BUS(1))}
+              label="Bus ID"
              disabled={saving}
              value={data.ems_bus_id}
              fullWidth
@@ -328,148 +310,102 @@ const SettingsApplication: FC = () => {
              margin="normal"
              select
            >
-              <MenuItem value={0x0a}>Terminal (0x0A)</MenuItem>
              <MenuItem value={0x0b}>Service Key (0x0B)</MenuItem>
              <MenuItem value={0x0d}>Modem (0x0D)</MenuItem>
-              <MenuItem value={0x0e}>Converter (0x0E)</MenuItem>
+              <MenuItem value={0x0a}>Terminal (0x0A)</MenuItem>
              <MenuItem value={0x0f}>Time Module (0x0F)</MenuItem>
-              <MenuItem value={0x48}>Gateway 1 (0x48)</MenuItem>
-              <MenuItem value={0x49}>Gateway 2 (0x49)</MenuItem>
-              <MenuItem value={0x4a}>Gateway 3 (0x4A)</MenuItem>
-              <MenuItem value={0x4b}>Gateway 4 (0x4B)</MenuItem>
-              <MenuItem value={0x4c}>Gateway 5 (0x4C)</MenuItem>
-              <MenuItem value={0x4d}>Gateway 7 (0x4D)</MenuItem>
+              <MenuItem value={0x12}>Alarm Module (0x12)</MenuItem>
            </ValidatedTextField>
          </Grid>
        </Grid>
        <Typography sx={{ pt: 2 }} variant="h6" color="primary">
-          {LL.GENERAL_OPTIONS()}
+          General Options
        </Typography>
-        <Box
-          sx={{
-            '& .MuiTextField-root': { width: '25ch' }
-          }}
-        >
-          <ValidatedTextField
-            name="locale"
-            label={LL.LANGUAGE_ENTITIES()}
-            disabled={saving}
-            value={data.locale}
-            variant="outlined"
-            onChange={updateFormValue}
-            margin="normal"
-            size="small"
-            select
-          >
-            <MenuItem value="en">English (EN)</MenuItem>
-            <Divider />
-            <MenuItem value="de">Deutsch (DE)</MenuItem>
-            <MenuItem value="fr">Français (FR)</MenuItem>
-            <MenuItem value="nl">Nederlands (NL)</MenuItem>
-            <MenuItem value="no">Norsk (NO)</MenuItem>
-            <MenuItem value="pl">Polski (PL)</MenuItem>
-            <MenuItem value="sv">Svenska (SV)</MenuItem>
-          </ValidatedTextField>
-        </Box>
        {data.led_gpio !== 0 && (
          <BlockFormControlLabel
            control={<Checkbox checked={data.hide_led} onChange={updateFormValue} name="hide_led" />}
-            label={LL.HIDE_LED()}
+            label="Hide LED"
            disabled={saving}
          />
        )}
        <BlockFormControlLabel
          control={<Checkbox checked={data.telnet_enabled} onChange={updateFormValue} name="telnet_enabled" />}
-          label={LL.ENABLE_TELNET()}
+          label="Enable Telnet Console"
          disabled={saving}
        />
        <BlockFormControlLabel
          control={<Checkbox checked={data.analog_enabled} onChange={updateFormValue} name="analog_enabled" />}
-          label={LL.ENABLE_ANALOG()}
+          label="Enable Analog Sensors"
          disabled={saving}
        />
        <BlockFormControlLabel
          control={<Checkbox checked={data.fahrenheit} onChange={updateFormValue} name="fahrenheit" />}
-          label={LL.CONVERT_FAHRENHEIT()}
+          label="Convert temperature values to Fahrenheit"
          disabled={saving}
        />
        <BlockFormControlLabel
          control={<Checkbox checked={data.notoken_api} onChange={updateFormValue} name="notoken_api" />}
-          label={LL.BYPASS_TOKEN()}
+          label="Bypass Access Token authorization on API calls"
          disabled={saving}
        />
        <BlockFormControlLabel
          control={<Checkbox checked={data.readonly_mode} onChange={updateFormValue} name="readonly_mode" />}
-          label={LL.READONLY()}
+          label="Enable Read only mode (blocks all outgoing EMS Tx write commands)"
          disabled={saving}
        />
        <BlockFormControlLabel
          control={<Checkbox checked={data.low_clock} onChange={updateFormValue} name="low_clock" />}
-          label={LL.UNDERCLOCK_CPU()}
-          disabled={saving}
-        />
-        <BlockFormControlLabel
-          control={<Checkbox checked={data.boiler_heatingoff} onChange={updateFormValue} name="boiler_heatingoff" />}
-          label={LL.HEATINGOFF()}
+          label="Underclock CPU speed"
          disabled={saving}
        />
        <Grid container spacing={0} direction="row" justifyContent="flex-start" alignItems="flex-start">
          <BlockFormControlLabel
            control={<Checkbox checked={data.shower_timer} onChange={updateFormValue} name="shower_timer" />}
-            label={LL.ENABLE_SHOWER_TIMER()}
+            label="Enable Shower Timer"
            disabled={saving}
          />
          <BlockFormControlLabel
-            sx={{ pb: 2 }}
            control={<Checkbox checked={data.shower_alert} onChange={updateFormValue} name="shower_alert" />}
-            label={LL.ENABLE_SHOWER_ALERT()}
+            label="Enable Shower Alert"
            disabled={!data.shower_timer}
          />
          {data.shower_alert && (
            <>
-              <Grid item sx={{ pr: 1, pb: 2 }}>
+              <Grid item xs={2}>
                <ValidatedTextField
                  fieldErrors={fieldErrors}
                  name="shower_alert_trigger"
-                  label={LL.TRIGGER_TIME()}
-                  InputProps={{
-                    endAdornment: <InputAdornment position="end">{LL.MINUTES()}</InputAdornment>
-                  }}
+                  label="Trigger Time (minutes)"
                  variant="outlined"
                  value={data.shower_alert_trigger}
                  type="number"
                  onChange={updateFormValue}
-                  size="small"
                  disabled={!data.shower_timer}
                />
              </Grid>
-              <Grid item sx={{ pb: 3 }}>
+              <Grid item xs={2}>
                <ValidatedTextField
                  fieldErrors={fieldErrors}
                  name="shower_alert_coldshot"
-                  label={LL.COLD_SHOT_DURATION()}
-                  InputProps={{
-                    endAdornment: <InputAdornment position="end">{LL.SECONDS()}</InputAdornment>
-                  }}
+                  label="Cold Shot Time (seconds)"
                  variant="outlined"
                  value={data.shower_alert_coldshot}
                  type="number"
                  onChange={updateFormValue}
-                  size="small"
                  disabled={!data.shower_timer}
                />
              </Grid>
            </>
          )}
        </Grid>
-        <Typography variant="h6" color="primary">
-          {LL.FORMATTING_OPTIONS()}
+        <Typography sx={{ pt: 2 }} variant="h6" color="primary">
+          Formatting Options
        </Typography>
        <Grid container spacing={1} direction="row" justifyContent="flex-start" alignItems="flex-start">
-          <Grid item xs={6} sm={4}>
+          <Grid item xs={4}>
            <ValidatedTextField
              name="bool_dashboard"
-              label={LL.BOOLEAN_FORMAT_DASHBOARD()}
+              label="Boolean Format Dashboard"
              value={data.bool_dashboard}
              fullWidth
              variant="outlined"
@@ -477,16 +413,16 @@ const SettingsApplication: FC = () => {
              margin="normal"
              select
            >
-              <MenuItem value={1}>{LL.ONOFF()}</MenuItem>
-              <MenuItem value={2}>{LL.ONOFF_CAP()}</MenuItem>
+              <MenuItem value={1}>on/off</MenuItem>
+              <MenuItem value={2}>ON/OFF</MenuItem>
              <MenuItem value={3}>true/false</MenuItem>
              <MenuItem value={5}>1/0</MenuItem>
            </ValidatedTextField>
          </Grid>
-          <Grid item xs={6} sm={4}>
+          <Grid item xs={4}>
            <ValidatedTextField
              name="bool_format"
-              label={LL.BOOLEAN_FORMAT_API()}
+              label="Boolean Format API/MQTT"
              value={data.bool_format}
              fullWidth
              variant="outlined"
@@ -494,18 +430,18 @@ const SettingsApplication: FC = () => {
              margin="normal"
              select
            >
-              <MenuItem value={1}>{LL.ONOFF()}</MenuItem>
-              <MenuItem value={2}>{LL.ONOFF_CAP()}</MenuItem>
+              <MenuItem value={1}>"on"/"off"</MenuItem>
+              <MenuItem value={2}>"ON"/"OFF"</MenuItem>
              <MenuItem value={3}>"true"/"false"</MenuItem>
              <MenuItem value={4}>true/false</MenuItem>
              <MenuItem value={5}>"1"/"0"</MenuItem>
              <MenuItem value={6}>1/0</MenuItem>
            </ValidatedTextField>
          </Grid>
-          <Grid item xs={6} sm={4}>
+          <Grid item xs={4}>
            <ValidatedTextField
              name="enum_format"
-              label={LL.ENUM_FORMAT()}
+              label="Enum Format API/MQTT"
              value={data.enum_format}
              fullWidth
              variant="outlined"
@@ -513,29 +449,29 @@ const SettingsApplication: FC = () => {
              margin="normal"
              select
            >
-              <MenuItem value={1}>{LL.VALUE(1)}</MenuItem>
-              <MenuItem value={2}>{LL.INDEX()}</MenuItem>
+              <MenuItem value={1}>Value</MenuItem>
+              <MenuItem value={2}>Index</MenuItem>
            </ValidatedTextField>
          </Grid>
        </Grid>
        {data.dallas_gpio !== 0 && (
          <>
            <Typography sx={{ pt: 2 }} variant="h6" color="primary">
-              {LL.TEMP_SENSORS()}
+              Temperature Sensors
            </Typography>
            <BlockFormControlLabel
              control={<Checkbox checked={data.dallas_parasite} onChange={updateFormValue} name="dallas_parasite" />}
-              label={LL.ENABLE_PARASITE()}
+              label="Enable parasite power"
              disabled={saving}
            />
          </>
        )}
        <Typography sx={{ pt: 2 }} variant="h6" color="primary">
-          {LL.LOGGING()}
+          Logging
        </Typography>
        <BlockFormControlLabel
          control={<Checkbox checked={data.trace_raw} onChange={updateFormValue} name="trace_raw" />}
-          label={LL.LOG_HEX()}
+          label="Log EMS telegrams in hexadecimal"
          disabled={saving}
        />
        <BlockFormControlLabel
@@ -547,11 +483,11 @@ const SettingsApplication: FC = () => {
              disabled={saving}
            />
          }
-          label={LL.ENABLE_SYSLOG()}
+          label="Enable Syslog"
        />
        {data.syslog_enabled && (
          <Grid container spacing={1} direction="row" justifyContent="flex-start" alignItems="flex-start">
-            <Grid item xs={4}>
+            <Grid item xs={5}>
              <ValidatedTextField
                fieldErrors={fieldErrors}
                name="syslog_host"
@@ -564,7 +500,7 @@ const SettingsApplication: FC = () => {
                disabled={saving}
              />
            </Grid>
-            <Grid item xs={4}>
+            <Grid item xs={6}>
              <ValidatedTextField
                fieldErrors={fieldErrors}
                name="syslog_port"
@@ -578,10 +514,10 @@ const SettingsApplication: FC = () => {
                disabled={saving}
              />
            </Grid>
-            <Grid item xs={4}>
+            <Grid item xs={5}>
              <ValidatedTextField
                name="syslog_level"
-                label={LL.LOG_LEVEL()}
+                label="Log Level"
                value={data.syslog_level}
                fullWidth
                variant="outlined"
@@ -598,14 +534,11 @@ const SettingsApplication: FC = () => {
                <MenuItem value={9}>ALL</MenuItem>
              </ValidatedTextField>
            </Grid>
-            <Grid item xs={4}>
+            <Grid item xs={6}>
              <ValidatedTextField
                fieldErrors={fieldErrors}
                name="syslog_mark_interval"
-                label={LL.MARK_INTERVAL()}
-                InputProps={{
-                  endAdornment: <InputAdornment position="end">{LL.SECONDS()}</InputAdornment>
-                }}
+                label="Mark Interval (seconds, 0=off)"
                fullWidth
                variant="outlined"
                value={data.syslog_mark_interval}
@@ -618,9 +551,9 @@ const SettingsApplication: FC = () => {
          </Grid>
        )}
        {restartNeeded && (
-          <MessageBox my={2} level="warning" message={LL.RESTART_TEXT()}>
+          <MessageBox my={2} level="warning" message="EMS-ESP needs to be restarted to apply changed system settings">
            <Button startIcon={<PowerSettingsNewIcon />} variant="contained" color="error" onClick={restart}>
-              {LL.RESTART()}
+              Restart
            </Button>
          </MessageBox>
        )}
@@ -634,7 +567,7 @@ const SettingsApplication: FC = () => {
              type="submit"
              onClick={validateAndSubmit}
            >
-              {LL.SAVE()}
+              Save
            </Button>
          </ButtonRow>
        )}
@@ -643,8 +576,8 @@ const SettingsApplication: FC = () => {
  };

  return (
-    <SectionContent title={LL.APPLICATION_SETTINGS()} titleGutter>
-      {restarting ? <RestartMonitor /> : content()}
+    <SectionContent title="Application Settings" titleGutter>
+      {content()}
    </SectionContent>
  );
 };
--- a/interface/src/project/SettingsCustomization.tsx
+++ b/interface/src/project/SettingsCustomization.tsx
@@ -13,157 +13,174 @@ import {
  ToggleButtonGroup,
  Tooltip,
  Grid,
-  TextField,
-  Link
+  TextField
 } from '@mui/material';

-import { MessageBox } from '../components';
-import PowerSettingsNewIcon from '@mui/icons-material/PowerSettingsNew';
-
 import { Table } from '@table-library/react-table-library/table';
 import { useTheme } from '@table-library/react-table-library/theme';
+import { useSort, SortToggleType } from '@table-library/react-table-library/sort';
 import { Header, HeaderRow, HeaderCell, Body, Row, Cell } from '@table-library/react-table-library/table';

 import { useSnackbar } from 'notistack';

 import SaveIcon from '@mui/icons-material/Save';
 import CancelIcon from '@mui/icons-material/Cancel';
-
+import EditOffOutlinedIcon from '@mui/icons-material/EditOffOutlined';
+import StarIcon from '@mui/icons-material/Star';
+import VisibilityOffOutlinedIcon from '@mui/icons-material/VisibilityOffOutlined';
+import CommentsDisabledOutlinedIcon from '@mui/icons-material/CommentsDisabledOutlined';
 import SettingsBackupRestoreIcon from '@mui/icons-material/SettingsBackupRestore';
+import KeyboardArrowUpOutlinedIcon from '@mui/icons-material/KeyboardArrowUpOutlined';
+import KeyboardArrowDownOutlinedIcon from '@mui/icons-material/KeyboardArrowDownOutlined';
+import UnfoldMoreOutlinedIcon from '@mui/icons-material/UnfoldMoreOutlined';
 import SearchIcon from '@mui/icons-material/Search';
 import FilterListIcon from '@mui/icons-material/FilterList';

-import OptionIcon from './OptionIcon';
-
 import { ButtonRow, FormLoader, ValidatedTextField, SectionContent } from '../components';

 import * as EMSESP from './api';

-import { extractErrorMessage, updateValue } from '../utils';
+import { extractErrorMessage } from '../utils';

 import { DeviceShort, Devices, DeviceEntity, DeviceEntityMask } from './types';

-import { useI18nContext } from '../i18n/i18n-react';
-import RestartMonitor from '../framework/system/RestartMonitor';
-
-export const APIURL = window.location.origin + '/api/';
-
 const SettingsCustomization: FC = () => {
-  const { LL } = useI18nContext();
-  const [restarting, setRestarting] = useState<boolean>(false);
-  const [restartNeeded, setRestartNeeded] = useState<boolean>(false);
-
  const { enqueueSnackbar } = useSnackbar();

-  const emptyDeviceEntity = { id: '', v: 0, n: '', cn: '', m: 0, w: false };
-
-  const [deviceEntities, setDeviceEntities] = useState<DeviceEntity[]>([emptyDeviceEntity]);
+  const [deviceEntities, setDeviceEntities] = useState<DeviceEntity[]>([{ id: '', v: 0, s: '', m: 0, w: false }]);
  const [devices, setDevices] = useState<Devices>();
  const [errorMessage, setErrorMessage] = useState<string>();
-  const [selectedDevice, setSelectedDevice] = useState<number>(-1);
+  const [selectedDevice, setSelectedDevice] = useState<number>(0);
  const [confirmReset, setConfirmReset] = useState<boolean>(false);
  const [selectedFilters, setSelectedFilters] = useState<number>(0);
  const [search, setSearch] = useState('');

-  const [deviceEntity, setDeviceEntity] = useState<DeviceEntity>();
-
  // eslint-disable-next-line
  const [masks, setMasks] = useState(() => ['']);

  const entities_theme = useTheme({
-    Table: `
-      --data-table-library_grid-template-columns: 150px repeat(1, minmax(80px, 1fr)) 45px 45px 120px;
-    `,
    BaseRow: `
      font-size: 14px;
-      .td {
-        height: 32px;
-      }
-    `,
-    BaseCell: `
-      &:nth-of-type(3) {
-        text-align: right;
-      }
-      &:nth-of-type(4) {
-        text-align: right;
-      }
-      &:last-of-type {
-        text-align: right;
-      }
+      color: white;
+      height: 32px;
+      min-height: 32px;
    `,
    HeaderRow: `
      text-transform: uppercase;
      background-color: black;
+      border-bottom: 1px solid #e0e0e0;
      color: #90CAF9;
-
-      .th {
-        border-bottom: 1px solid #565656;
-        font-weight: 500;
-      }
-
-      &:nth-of-type(1) .th {
-        text-align: center;
-      }
+      font-weight: 500;
    `,
    Row: `
      background-color: #1e1e1e;
+      border-top: 1px solid #565656;
+      border-bottom: 1px solid #565656;
      position: relative;
-      cursor: pointer;
-    
-      .td {
-        border-top: 1px solid #565656;
-        border-bottom: 1px solid #565656;
+      z-index: 1;
+      &:not(:last-of-type) {
+        margin-bottom: -1px;
      }
-
-      &.tr.tr-body.row-select.row-select-single-selected {
+      &:not(:first-of-type) {
+        margin-top: -1px;
+      }
+      &:hover {
+        z-index: 2;
+        color: white;
+        border-top: 1px solid #177ac9;
+        border-bottom: 1px solid #177ac9;
+      },
+      &.tr.tr-body.row-select.row-select-single-selected, &.tr.tr-body.row-select.row-select-selected {
        background-color: #3d4752;
        color: white;
        font-weight: normal;
-      }
-
-      &:hover .td {
+        z-index: 2;
        border-top: 1px solid #177ac9;
        border-bottom: 1px solid #177ac9;
      }
-
-      &:nth-of-type(odd) .td {
-        background-color: #303030;
-      }
    `,
-    Cell: `
+    BaseCell: `
+      border-top: 1px solid transparent;
+      border-right: 1px solid transparent;
+      border-bottom: 1px solid transparent;
+      &:not(.stiff) > div {
+        white-space: nowrap;
+        overflow: hidden;
+        text-overflow: ellipsis;
+      }
+      &:nth-of-type(1) {
+        width: 120px;
+        min-width: 120px;
+        max-width: 120px;
+      }
      &:nth-of-type(2) {
-        padding: 8px;
+        padding-left: 8px;
+        flex: 1;
      }
      &:nth-of-type(3) {
-        padding-right: 4px;
-      }
-      &:nth-of-type(4) {
-        padding-right: 4px;
-      }
-      &:last-of-type {
        padding-right: 8px;
+        text-align: right;
+        width: 120px;
+        min-width: 120px;
+      }
+    `,
+    HeaderCell: `
+      &:nth-of-type(1) {
+        padding-left: 24px;
+      }
+      &:nth-of-type(2) {
+        padding-left: 0px;
+      }
+      &:not(:last-of-type) {
+        border-right: 1px solid #565656;
      }
    `
  });

+  const getSortIcon = (state: any, sortKey: any) => {
+    if (state.sortKey === sortKey && state.reverse) {
+      return <KeyboardArrowDownOutlinedIcon />;
+    }
+    if (state.sortKey === sortKey && !state.reverse) {
+      return <KeyboardArrowUpOutlinedIcon />;
+    }
+    return <UnfoldMoreOutlinedIcon />;
+  };
+
+  const entity_sort = useSort(
+    { nodes: deviceEntities },
+    {},
+    {
+      sortIcon: {
+        iconDefault: <UnfoldMoreOutlinedIcon />,
+        iconUp: <KeyboardArrowUpOutlinedIcon />,
+        iconDown: <KeyboardArrowDownOutlinedIcon />
+      },
+      sortToggleType: SortToggleType.AlternateWithReset,
+      sortFns: {
+        NAME: (array) => array.sort((a, b) => a.id.localeCompare(b.id))
+      }
+    }
+  );
+
  const fetchDevices = useCallback(async () => {
    try {
      setDevices((await EMSESP.readDevices()).data);
-    } catch (error) {
-      setErrorMessage(extractErrorMessage(error, LL.PROBLEM_LOADING()));
+    } catch (error: unknown) {
+      setErrorMessage(extractErrorMessage(error, 'Failed to fetch device list'));
    }
-  }, [LL]);
+  }, []);

  const setInitialMask = (data: DeviceEntity[]) => {
-    setDeviceEntities(data.map((de) => ({ ...de, o_m: de.m, o_cn: de.cn, o_mi: de.mi, o_ma: de.ma })));
+    setDeviceEntities(data.map((de) => ({ ...de, om: de.m })));
  };

  const fetchDeviceEntities = async (unique_id: number) => {
    try {
-      const new_deviceEntities = (await EMSESP.readDeviceEntities({ id: unique_id })).data;
-      setInitialMask(new_deviceEntities);
-    } catch (error) {
-      setErrorMessage(extractErrorMessage(error, LL.PROBLEM_LOADING()));
+      const data = (await EMSESP.readDeviceEntities({ id: unique_id })).data;
+      setInitialMask(data);
+    } catch (error: unknown) {
+      setErrorMessage(extractErrorMessage(error, 'Problem fetching device entities'));
    }
  };

@@ -182,18 +199,6 @@ const SettingsCustomization: FC = () => {
    return value;
  }

-  function formatName(de: DeviceEntity) {
-    return (
-      <>
-        {de.n && (de.n[0] === '!' ? LL.COMMAND() + ': ' + de.n.slice(1) : de.cn && de.cn !== '' ? de.cn : de.n) + ' '}(
-        <Link target="_blank" href={APIURL + devices?.devices[selectedDevice].tn + '/' + de.id}>
-          {de.id}
-        </Link>
-        )
-      </>
-    );
-  }
-
  const getMaskNumber = (newMask: string[]) => {
    var new_mask = 0;
    for (let entry of newMask) {
@@ -216,9 +221,6 @@ const SettingsCustomization: FC = () => {
    if ((m & 8) === 8) {
      new_masks.push('8');
    }
-    if ((m & 128) === 128) {
-      new_masks.push('128');
-    }
    return new_masks;
  };

@@ -239,70 +241,56 @@ const SettingsCustomization: FC = () => {
    );
  };

-  const changeSelectedDevice = (event: React.ChangeEvent<HTMLInputElement>) => {
-    if (devices) {
-      const selected_device = parseInt(event.target.value, 10);
-      setSelectedDevice(selected_device);
-      fetchDeviceEntities(devices?.devices[selected_device].i);
-      setRestartNeeded(false);
+  function compareDevices(a: DeviceShort, b: DeviceShort) {
+    if (a.s < b.s) {
+      return -1;
    }
+    if (a.s > b.s) {
+      return 1;
+    }
+    return 0;
+  }
+
+  const changeSelectedDevice = (event: React.ChangeEvent<HTMLInputElement>) => {
+    const selected_device = parseInt(event.target.value, 10);
+    setSelectedDevice(selected_device);
+    fetchDeviceEntities(selected_device);
  };

  const resetCustomization = async () => {
    try {
      await EMSESP.resetCustomizations();
-      enqueueSnackbar(LL.CUSTOMIZATIONS_RESTART(), { variant: 'info' });
-    } catch (error) {
-      enqueueSnackbar(extractErrorMessage(error, LL.PROBLEM_UPDATING()), { variant: 'error' });
+      enqueueSnackbar('All customizations have been removed. Restarting...', { variant: 'info' });
+    } catch (error: unknown) {
+      enqueueSnackbar(extractErrorMessage(error, 'Problem resetting customizations'), { variant: 'error' });
    } finally {
      setConfirmReset(false);
    }
  };

-  const restart = async () => {
-    try {
-      await EMSESP.restart();
-      setRestarting(true);
-    } catch (error) {
-      enqueueSnackbar(extractErrorMessage(error, LL.PROBLEM_UPDATING()), { variant: 'error' });
-    }
-  };
-
  const saveCustomization = async () => {
-    if (devices && deviceEntities && selectedDevice !== -1) {
+    if (deviceEntities && selectedDevice) {
      const masked_entities = deviceEntities
-        .filter((de) => de.m !== de.o_m || de.cn !== de.o_cn || de.ma !== de.o_ma || de.mi !== de.o_mi)
-        .map(
-          (new_de) =>
-            new_de.m.toString(16).padStart(2, '0') +
-            new_de.id +
-            (new_de.cn || new_de.mi || new_de.ma ? '|' : '') +
-            (new_de.cn ? new_de.cn : '') +
-            (new_de.mi ? '>' + new_de.mi : '') +
-            (new_de.ma ? '<' + new_de.ma : '')
-        );
+        .filter((de) => de.m !== de.om)
+        .map((new_de) => new_de.m.toString(16).padStart(2, '0') + new_de.s);

-      // check size in bytes to match buffer in CPP, which is 2048
-      const bytes = new TextEncoder().encode(JSON.stringify(masked_entities)).length;
-      if (bytes > 2000) {
-        enqueueSnackbar(LL.CUSTOMIZATIONS_FULL(), { variant: 'warning' });
+      if (masked_entities.length > 60) {
+        enqueueSnackbar('Selected entities exceeded limit of 60. Please Save in batches', { variant: 'warning' });
        return;
      }

      try {
-        const response = await EMSESP.writeCustomEntities({
-          id: devices?.devices[selectedDevice].i,
+        const response = await EMSESP.writeMaskedEntities({
+          id: selectedDevice,
          entity_ids: masked_entities
        });
        if (response.status === 200) {
-          enqueueSnackbar(LL.CUSTOMIZATIONS_SAVED(), { variant: 'success' });
-        } else if (response.status === 201) {
-          setRestartNeeded(true);
+          enqueueSnackbar('Customization saved', { variant: 'success' });
        } else {
-          enqueueSnackbar(LL.PROBLEM_UPDATING(), { variant: 'error' });
+          enqueueSnackbar('Customization save failed', { variant: 'error' });
        }
-      } catch (error) {
-        enqueueSnackbar(extractErrorMessage(error, LL.PROBLEM_UPDATING()), { variant: 'error' });
+      } catch (error: unknown) {
+        enqueueSnackbar(extractErrorMessage(error, 'Problem sending entity list'), { variant: 'error' });
      }
      setInitialMask(deviceEntities);
    }
@@ -315,19 +303,12 @@ const SettingsCustomization: FC = () => {

    return (
      <>
-        <Box mb={2} color="warning.main">
-          <Typography variant="body2">{LL.CUSTOMIZATIONS_HELP_1()}</Typography>
-          <Typography variant="body2">
-            <OptionIcon type="favorite" isSet={true} />={LL.CUSTOMIZATIONS_HELP_2()}&nbsp;&nbsp;
-            <OptionIcon type="readonly" isSet={true} />={LL.CUSTOMIZATIONS_HELP_3()}&nbsp;&nbsp;
-            <OptionIcon type="api_mqtt_exclude" isSet={true} />={LL.CUSTOMIZATIONS_HELP_4()}&nbsp;&nbsp;
-            <OptionIcon type="web_exclude" isSet={true} />={LL.CUSTOMIZATIONS_HELP_5()}&nbsp;&nbsp;
-            <OptionIcon type="deleted" isSet={true} />={LL.CUSTOMIZATIONS_HELP_6()}
-          </Typography>
+        <Box color="warning.main">
+          <Typography variant="body2">Select a device and customize each of its entities using the options.</Typography>
        </Box>
        <ValidatedTextField
          name="device"
-          label={LL.EMS_DEVICE()}
+          label="EMS Device"
          variant="outlined"
          fullWidth
          value={selectedDevice}
@@ -335,11 +316,11 @@ const SettingsCustomization: FC = () => {
          margin="normal"
          select
        >
-          <MenuItem disabled key={0} value={-1}>
-            {LL.SELECT_DEVICE()}...
+          <MenuItem disabled key={0} value={0}>
+            Select a device...
          </MenuItem>
-          {devices.devices.map((device: DeviceShort, index) => (
-            <MenuItem key={index} value={index}>
+          {devices.devices.sort(compareDevices).map((device: DeviceShort, index) => (
+            <MenuItem key={index} value={device.i}>
              {device.s}
            </MenuItem>
          ))}
@@ -348,33 +329,6 @@ const SettingsCustomization: FC = () => {
    );
  };

-  const editEntity = (de: DeviceEntity) => {
-    if (de.n === undefined || (de.n && de.n[0] === '!')) {
-      return;
-    }
-
-    if (de.cn === undefined) {
-      de.cn = '';
-    }
-    setDeviceEntity(de);
-  };
-
-  const updateEntity = () => {
-    if (deviceEntity) {
-      setDeviceEntities((prevState) => {
-        const newState = prevState.map((obj) => {
-          if (obj.id === deviceEntity.id) {
-            return { ...obj, cn: deviceEntity.cn, mi: deviceEntity.mi, ma: deviceEntity.ma };
-          }
-          return obj;
-        });
-        return newState;
-      });
-    }
-
-    setDeviceEntity(undefined);
-  };
-
  const renderDeviceData = () => {
    if (devices?.devices.length === 0 || deviceEntities[0].id === '') {
      return;
@@ -409,11 +363,9 @@ const SettingsCustomization: FC = () => {
              }}
            />
          </Grid>
-          <Tooltip arrow placement="top" title="apply filter">
-            <Grid item>
-              <FilterListIcon color="primary" sx={{ fontSize: 14, verticalAlign: 'middle' }} />:
-            </Grid>
-          </Tooltip>
+          <Grid item>
+            <FilterListIcon color="primary" sx={{ fontSize: 14, verticalAlign: 'middle' }} />:
+          </Grid>
          <Grid item>
            <ToggleButtonGroup
              size="small"
@@ -424,25 +376,34 @@ const SettingsCustomization: FC = () => {
              }}
            >
              <ToggleButton value="8">
-                <OptionIcon type="favorite" isSet={true} />
+                <Tooltip arrow placement="top" title="filter favorites">
+                  <StarIcon sx={{ fontSize: 14 }} />
+                </Tooltip>
              </ToggleButton>
              <ToggleButton value="4">
-                <OptionIcon type="readonly" isSet={true} />
+                <Tooltip arrow placement="top" title="filter entities with write action disabled">
+                  <EditOffOutlinedIcon sx={{ fontSize: 14 }} />
+                </Tooltip>
              </ToggleButton>
              <ToggleButton value="2">
-                <OptionIcon type="api_mqtt_exclude" isSet={true} />
+                <Tooltip arrow placement="top" title="filter entities excluded from MQTT and API outputs">
+                  <CommentsDisabledOutlinedIcon sx={{ fontSize: 14 }} />
+                </Tooltip>
              </ToggleButton>
              <ToggleButton value="1">
-                <OptionIcon type="web_exclude" isSet={true} />
-              </ToggleButton>
-              <ToggleButton value="128">
-                <OptionIcon type="deleted" isSet={true} />
+                <Tooltip arrow placement="top" title="filter entities hidden from Web Dashboard">
+                  <VisibilityOffOutlinedIcon sx={{ fontSize: 14 }} />
+                </Tooltip>
              </ToggleButton>
            </ToggleButtonGroup>
          </Grid>

          <Grid item>
-            <Tooltip arrow placement="top" title="set selected entities to be both visible and output">
+            <CommentsDisabledOutlinedIcon color="primary" sx={{ fontSize: 14, verticalAlign: 'middle' }} />
+            <VisibilityOffOutlinedIcon color="primary" sx={{ fontSize: 14, verticalAlign: 'middle' }} />:
+          </Grid>
+          <Grid item>
+            <Tooltip arrow placement="top" title="mark shown entities to be all visible and output ">
              <Button
                size="small"
                sx={{ fontSize: 10 }}
@@ -450,14 +411,12 @@ const SettingsCustomization: FC = () => {
                color="inherit"
                onClick={() => maskDisabled(false)}
              >
-                {LL.SET_ALL()}&nbsp;
-                <OptionIcon type="api_mqtt_exclude" isSet={false} />
-                <OptionIcon type="web_exclude" isSet={false} />
+                enable
              </Button>
            </Tooltip>
          </Grid>
          <Grid item>
-            <Tooltip arrow placement="top" title="set selected entities to be not visible and not output">
+            <Tooltip arrow placement="top" title="mark shown entities to be not visible or output ">
              <Button
                size="small"
                sx={{ fontSize: 10 }}
@@ -465,88 +424,64 @@ const SettingsCustomization: FC = () => {
                color="inherit"
                onClick={() => maskDisabled(true)}
              >
-                {LL.SET_ALL()}&nbsp;
-                <OptionIcon type="api_mqtt_exclude" isSet={true} />
-                <OptionIcon type="web_exclude" isSet={true} />
+                disable
              </Button>
            </Tooltip>
          </Grid>
        </Grid>
-        <Table data={{ nodes: shown_data }} theme={entities_theme} layout={{ custom: true }}>
+        <Table data={{ nodes: shown_data }} theme={entities_theme} sort={entity_sort} layout={{ custom: true }}>
          {(tableList: any) => (
            <>
              <Header>
                <HeaderRow>
-                  <HeaderCell stiff>{LL.OPTIONS()}</HeaderCell>
+                  <HeaderCell>OPTIONS</HeaderCell>
                  <HeaderCell resize>
-                    <Button fullWidth style={{ fontSize: '14px', justifyContent: 'flex-start' }}>
-                      {LL.NAME(1)}
+                    <Button
+                      fullWidth
+                      style={{ fontSize: '14px', justifyContent: 'flex-start' }}
+                      endIcon={getSortIcon(entity_sort.state, 'NAME')}
+                      onClick={() => entity_sort.fns.onToggleSort({ sortKey: 'NAME' })}
+                    >
+                      NAME
                    </Button>
                  </HeaderCell>
-                  <HeaderCell stiff>{LL.MIN()}</HeaderCell>
-                  <HeaderCell stiff>{LL.MAX()}</HeaderCell>
-                  <HeaderCell resize>{LL.VALUE(0)}</HeaderCell>
+                  <HeaderCell>VALUE</HeaderCell>
                </HeaderRow>
              </Header>
              <Body>
                {tableList.map((de: DeviceEntity) => (
-                  <Row key={de.id} item={de} onClick={() => editEntity(de)}>
-                    <Cell stiff>
-                      {!deviceEntity && (
-                        <ToggleButtonGroup
-                          size="small"
-                          color="secondary"
-                          value={getMaskString(de.m)}
-                          onChange={(event, mask) => {
-                            de.m = getMaskNumber(mask);
-                            if (de.n === '' && de.m & DeviceEntityMask.DV_READONLY) {
-                              de.m = de.m | DeviceEntityMask.DV_WEB_EXCLUDE;
-                            }
-                            if (de.m & DeviceEntityMask.DV_WEB_EXCLUDE) {
-                              de.m = de.m & ~DeviceEntityMask.DV_FAVORITE;
-                            }
-                            setMasks(['']);
-                          }}
-                        >
-                          <ToggleButton value="8" disabled={(de.m & 0x81) !== 0 || de.n === undefined}>
-                            <OptionIcon
-                              type="favorite"
-                              isSet={(de.m & DeviceEntityMask.DV_FAVORITE) === DeviceEntityMask.DV_FAVORITE}
-                            />
-                          </ToggleButton>
-                          <ToggleButton value="4" disabled={!de.w || (de.m & 0x83) >= 3}>
-                            <OptionIcon
-                              type="readonly"
-                              isSet={(de.m & DeviceEntityMask.DV_READONLY) === DeviceEntityMask.DV_READONLY}
-                            />
-                          </ToggleButton>
-                          <ToggleButton value="2" disabled={de.n === '' || (de.m & 0x80) !== 0}>
-                            <OptionIcon
-                              type="api_mqtt_exclude"
-                              isSet={
-                                (de.m & DeviceEntityMask.DV_API_MQTT_EXCLUDE) === DeviceEntityMask.DV_API_MQTT_EXCLUDE
-                              }
-                            />
-                          </ToggleButton>
-                          <ToggleButton value="1" disabled={de.n === undefined || (de.m & 0x80) !== 0}>
-                            <OptionIcon
-                              type="web_exclude"
-                              isSet={(de.m & DeviceEntityMask.DV_WEB_EXCLUDE) === DeviceEntityMask.DV_WEB_EXCLUDE}
-                            />
-                          </ToggleButton>
-                          <ToggleButton value="128">
-                            <OptionIcon
-                              type="deleted"
-                              isSet={(de.m & DeviceEntityMask.DV_DELETED) === DeviceEntityMask.DV_DELETED}
-                            />
-                          </ToggleButton>
-                        </ToggleButtonGroup>
-                      )}
+                  <Row key={de.id} item={de}>
+                    <Cell>
+                      <ToggleButtonGroup
+                        size="small"
+                        color="secondary"
+                        value={getMaskString(de.m)}
+                        onChange={(event, mask) => {
+                          de.m = getMaskNumber(mask);
+                          if (de.m & DeviceEntityMask.DV_WEB_EXCLUDE) {
+                            de.m = de.m & ~DeviceEntityMask.DV_FAVORITE;
+                          }
+                          setMasks(['']);
+                        }}
+                      >
+                        <ToggleButton value="8" disabled={(de.m & 1) !== 0 || de.id === ''}>
+                          <StarIcon sx={{ fontSize: 14 }} />
+                        </ToggleButton>
+                        <ToggleButton value="4" disabled={!de.w || (de.m & 3) === 3}>
+                          <EditOffOutlinedIcon sx={{ fontSize: 14 }} />
+                        </ToggleButton>
+                        <ToggleButton value="2">
+                          <CommentsDisabledOutlinedIcon sx={{ fontSize: 14 }} />
+                        </ToggleButton>
+                        <ToggleButton value="1">
+                          <VisibilityOffOutlinedIcon sx={{ fontSize: 14 }} />
+                        </ToggleButton>
+                      </ToggleButtonGroup>
                    </Cell>
-                    <Cell>{!deviceEntity && formatName(de)}</Cell>
-                    <Cell>{!deviceEntity && !(de.m & DeviceEntityMask.DV_READONLY) && formatValue(de.mi)}</Cell>
-                    <Cell>{!deviceEntity && !(de.m & DeviceEntityMask.DV_READONLY) && formatValue(de.ma)}</Cell>
-                    <Cell>{!deviceEntity && formatValue(de.v)}</Cell>
+                    <Cell>
+                      {de.id}&nbsp;({de.s})
+                    </Cell>
+                    <Cell>{formatValue(de.v)}</Cell>
                  </Row>
                ))}
              </Body>
@@ -559,11 +494,14 @@ const SettingsCustomization: FC = () => {

  const renderResetDialog = () => (
    <Dialog open={confirmReset} onClose={() => setConfirmReset(false)}>
-      <DialogTitle>{LL.RESET(1)}</DialogTitle>
-      <DialogContent dividers>{LL.CUSTOMIZATIONS_RESET()}</DialogContent>
+      <DialogTitle>Reset</DialogTitle>
+      <DialogContent dividers>
+        Are you sure you want remove all customizations including the custom settings of the Temperature and Analog
+        sensors?
+      </DialogContent>
      <DialogActions>
        <Button startIcon={<CancelIcon />} variant="outlined" onClick={() => setConfirmReset(false)} color="secondary">
-          {LL.CANCEL()}
+          Cancel
        </Button>
        <Button
          startIcon={<SettingsBackupRestoreIcon />}
@@ -572,32 +510,25 @@ const SettingsCustomization: FC = () => {
          autoFocus
          color="error"
        >
-          {LL.RESET(0)}
+          Reset
        </Button>
      </DialogActions>
    </Dialog>
  );

-  const renderContent = () => (
-    <>
-      <Typography sx={{ pt: 2, pb: 2 }} variant="h6" color="primary">
-        {LL.DEVICE_ENTITIES()}
-      </Typography>
-      {renderDeviceList()}
-      {renderDeviceData()}
-      {restartNeeded && (
-        <MessageBox my={2} level="warning" message={LL.RESTART_TEXT()}>
-          <Button startIcon={<PowerSettingsNewIcon />} variant="contained" color="error" onClick={restart}>
-            {LL.RESTART()}
-          </Button>
-        </MessageBox>
-      )}
-      {!restartNeeded && (
+  const content = () => {
+    return (
+      <>
+        <Typography sx={{ pt: 2, pb: 2 }} variant="h6" color="primary">
+          Device Entities
+        </Typography>
+        {renderDeviceList()}
+        {renderDeviceData()}
        <Box display="flex" flexWrap="wrap">
          <Box flexGrow={1}>
            <ButtonRow>
              <Button startIcon={<SaveIcon />} variant="outlined" color="primary" onClick={() => saveCustomization()}>
-                {LL.SAVE()}
+                Save
              </Button>
            </ButtonRow>
          </Box>
@@ -608,90 +539,18 @@ const SettingsCustomization: FC = () => {
              color="error"
              onClick={() => setConfirmReset(true)}
            >
-              {LL.RESET(0)}
+              Reset
            </Button>
          </ButtonRow>
        </Box>
-      )}
-      {renderResetDialog()}
-    </>
-  );
-
-  const renderEditDialog = () => {
-    if (deviceEntity) {
-      const de = deviceEntity;
-      return (
-        <Dialog open={!!deviceEntity} onClose={() => setDeviceEntity(undefined)}>
-          <DialogTitle>{LL.EDIT() + ' ' + LL.ENTITY() + ' "' + de.id + '"'}</DialogTitle>
-          <DialogContent dividers>
-            <Box color="warning.main" mb={2}>
-              <Typography variant="body2">
-                {LL.DEFAULT(1) + ' ' + LL.NAME(1)}:&nbsp;{deviceEntity.n}
-              </Typography>
-            </Box>
-            <Grid container spacing={1}>
-              <Grid item>
-                <TextField
-                  name="cn"
-                  label={LL.NEW_NAME_OF(LL.ENTITY())}
-                  value={deviceEntity.cn}
-                  autoFocus
-                  sx={{ width: '30ch' }}
-                  onChange={updateValue(setDeviceEntity)}
-                />
-              </Grid>
-              {typeof de.v === 'number' && de.w && !(de.m & DeviceEntityMask.DV_READONLY) && (
-                <>
-                  <Grid item>
-                    <TextField
-                      name="mi"
-                      label={LL.MIN()}
-                      value={deviceEntity.mi}
-                      sx={{ width: '8ch' }}
-                      onChange={updateValue(setDeviceEntity)}
-                    />
-                  </Grid>
-                  <Grid item>
-                    <TextField
-                      name="ma"
-                      label={LL.MAX()}
-                      value={deviceEntity.ma}
-                      sx={{ width: '8ch' }}
-                      onChange={updateValue(setDeviceEntity)}
-                    />
-                  </Grid>
-                </>
-              )}
-            </Grid>
-          </DialogContent>
-          <DialogActions>
-            <Button
-              startIcon={<CancelIcon />}
-              variant="outlined"
-              onClick={() => setDeviceEntity(undefined)}
-              color="secondary"
-            >
-              {LL.CANCEL()}
-            </Button>
-            <Button
-              startIcon={<SaveIcon />}
-              variant="outlined"
-              type="submit"
-              onClick={() => updateEntity()}
-              color="warning"
-            >
-              {LL.SAVE()}
-            </Button>
-          </DialogActions>
-        </Dialog>
-      );
-    }
+        {renderResetDialog()}
+      </>
+    );
  };

  return (
-    <SectionContent title={LL.USER_CUSTOMIZATION()} titleGutter>
-      {restarting ? <RestartMonitor /> : renderContent()}
-      {renderEditDialog()}
+    <SectionContent title="User Customization" titleGutter>
+      {content()}
    </SectionContent>
  );
 };
--- a/interface/src/project/api.ts
+++ b/interface/src/project/api.ts
@@ -12,7 +12,7 @@ import {
  DeviceData,
  DeviceEntity,
  UniqueID,
-  CustomEntities,
+  MaskedEntities,
  WriteValue,
  WriteSensor,
  WriteAnalog,
@@ -63,8 +63,8 @@ export function readDeviceEntities(unique_id: UniqueID): AxiosPromise<DeviceEnti
  return AXIOS_BIN.post('/deviceEntities', unique_id);
 }

-export function writeCustomEntities(customEntities: CustomEntities): AxiosPromise<void> {
-  return AXIOS.post('/customEntities', customEntities);
+export function writeMaskedEntities(maskedEntities: MaskedEntities): AxiosPromise<void> {
+  return AXIOS.post('/maskedEntities', maskedEntities);
 }

 export function writeValue(writevalue: WriteValue): AxiosPromise<void> {
--- a/interface/src/project/types.ts
+++ b/interface/src/project/types.ts
@@ -1,5 +1,4 @@
 export interface Settings {
-  locale: string;
  tx_mode: number;
  ems_bus_id: number;
  syslog_enabled: boolean;
@@ -7,7 +6,7 @@ export interface Settings {
  syslog_mark_interval: number;
  syslog_host: string;
  syslog_port: number;
-  boiler_heatingoff: boolean;
+  master_thermostat: number;
  shower_timer: boolean;
  shower_alert: boolean;
  shower_alert_coldshot: number;
@@ -34,7 +33,6 @@ export interface Settings {
  eth_power: number;
  eth_phy_addr: number;
  eth_clock_mode: number;
-  platform: string;
 }

 export enum busConnectionStatus {
@@ -44,7 +42,7 @@ export enum busConnectionStatus {
 }

 export interface Stat {
-  id: string; // id - needs to be a string
+  id: string; // name
  s: number; // success
  f: number; // fail
  q: number; // quality
@@ -60,8 +58,7 @@ export interface Status {
 }
 export interface Device {
  id: string; // id index
-  tn: string; // device type translated name
-  t: number; // device type id
+  t: string; // type
  b: string; // brand
  n: string; // name
  d: number; // deviceid
@@ -101,20 +98,16 @@ export interface SensorData {
 }

 export interface CoreData {
-  connected: boolean;
  devices: Device[];
-  s_n: string;
  active_sensors: number;
  analog_enabled: boolean;
 }

 export interface DeviceShort {
  i: number; // id
-  d?: number; // deviceid
-  p?: number; // productid
+  d: number; // deviceid
+  p: number; // productid
  s: string; // shortname
-  t?: number; // device type id
-  tn?: string; // device type internal name
 }

 export interface Devices {
@@ -139,21 +132,15 @@ export interface DeviceData {
 }

 export interface DeviceEntity {
-  id: string; // shortname
-  v?: any; // value, in any format, optional
-  n?: string; // fullname, optional
-  cn?: string; // custom fullname, optional
+  id: string; // name
+  v: any; // value, in any format
+  s: string; // shortname
  m: number; // mask
-  o_m?: number; // original mask before edits
-  o_cn?: string; // original cn before edits
+  om?: number; // original mask before edits
  w: boolean; // writeable
-  mi?: string; // min value
-  ma?: string; // max value
-  o_mi?: string;
-  o_ma?: string;
 }

-export interface CustomEntities {
+export interface MaskedEntities {
  id: number;
  entity_ids: string[];
 }
@@ -183,9 +170,7 @@ export enum DeviceValueUOM {
  MV,
  SQM,
  M3,
-  L,
-  KMIN,
-  K
+  L
 }

 export const DeviceValueUOM_s = [
@@ -198,20 +183,18 @@ export const DeviceValueUOM_s = [
  'Wh',
  'hours',
  'minutes',
-  'µA',
+  'uA',
  'bar',
  'kW',
  'W',
  'KB',
-  'seconds',
+  'second',
  'dBm',
  '°F',
  'mV',
-  'm²',
-  'm³',
-  'l',
-  'K*min',
-  'K'
+  'sqm',
+  'm3',
+  'l'
 ];

 export enum AnalogType {
@@ -251,10 +234,7 @@ export const BOARD_PROFILES: BoardProfiles = {
  'MH-ET': 'MH-ET Live D1 Mini',
  LOLIN: 'Lolin D32',
  OLIMEX: 'Olimex ESP32-EVB',
-  OLIMEXPOE: 'Olimex ESP32-POE',
-  C3MINI: 'Wemos C3 Mini',
-  S2MINI: 'Wemos S2 Mini',
-  S3MINI: 'Liligo S3'
+  OLIMEXPOE: 'Olimex ESP32-POE'
 };

 export interface BoardProfileName {
@@ -299,6 +279,5 @@ export enum DeviceEntityMask {
  DV_WEB_EXCLUDE = 1,
  DV_API_MQTT_EXCLUDE = 2,
  DV_READONLY = 4,
-  DV_FAVORITE = 8,
-  DV_DELETED = 128
+  DV_FAVORITE = 8
 }
--- a/interface/src/project/validators.ts
+++ b/interface/src/project/validators.ts
@@ -7,13 +7,12 @@ export const GPIO_VALIDATOR = {
    if (
      value &&
      (value === 1 ||
-        (value >= 10 && value <= 12) ||
+        (value >= 6 && value <= 12) ||
        (value >= 14 && value <= 15) ||
        value === 20 ||
        value === 24 ||
        (value >= 28 && value <= 31) ||
-        value > 40 ||
-        value < 0)
+        value > 40)
    ) {
      callback('Must be an valid GPIO port');
    } else {
@@ -22,61 +21,24 @@ export const GPIO_VALIDATOR = {
  }
 };

-export const GPIO_VALIDATORC3 = {
-  validator(rule: InternalRuleItem, value: number, callback: (error?: string) => void) {
-    if (value && ((value >= 11 && value <= 19) || value > 21 || value < 0)) {
-      callback('Must be an valid GPIO port');
-    } else {
-      callback();
-    }
-  }
-};
-
-export const GPIO_VALIDATORS2 = {
-  validator(rule: InternalRuleItem, value: number, callback: (error?: string) => void) {
-    if (value && ((value >= 19 && value <= 20) || (value >= 22 && value <= 32) || value > 40 || value < 0)) {
-      callback('Must be an valid GPIO port');
-    } else {
-      callback();
-    }
-  }
-};
-
 export const createSettingsValidator = (settings: Settings) =>
  new Schema({
-    ...(settings.board_profile === 'CUSTOM' &&
-      settings.platform === 'ESP32' && {
-        led_gpio: [{ required: true, message: 'LED GPIO is required' }, GPIO_VALIDATOR],
-        dallas_gpio: [{ required: true, message: 'GPIO is required' }, GPIO_VALIDATOR],
-        pbutton_gpio: [{ required: true, message: 'Button GPIO is required' }, GPIO_VALIDATOR],
-        tx_gpio: [{ required: true, message: 'Tx GPIO is required' }, GPIO_VALIDATOR],
-        rx_gpio: [{ required: true, message: 'Rx GPIO is required' }, GPIO_VALIDATOR]
-      }),
-    ...(settings.board_profile === 'CUSTOM' &&
-      settings.platform === 'ESP32-C3' && {
-        led_gpio: [{ required: true, message: 'LED GPIO is required' }, GPIO_VALIDATORC3],
-        dallas_gpio: [{ required: true, message: 'GPIO is required' }, GPIO_VALIDATORC3],
-        pbutton_gpio: [{ required: true, message: 'Button GPIO is required' }, GPIO_VALIDATORC3],
-        tx_gpio: [{ required: true, message: 'Tx GPIO is required' }, GPIO_VALIDATORC3],
-        rx_gpio: [{ required: true, message: 'Rx GPIO is required' }, GPIO_VALIDATORC3]
-      }),
-    ...(settings.board_profile === 'CUSTOM' &&
-      settings.platform === 'ESP32-S2' && {
-        led_gpio: [{ required: true, message: 'LED GPIO is required' }, GPIO_VALIDATORS2],
-        dallas_gpio: [{ required: true, message: 'GPIO is required' }, GPIO_VALIDATORS2],
-        pbutton_gpio: [{ required: true, message: 'Button GPIO is required' }, GPIO_VALIDATORS2],
-        tx_gpio: [{ required: true, message: 'Tx GPIO is required' }, GPIO_VALIDATORS2],
-        rx_gpio: [{ required: true, message: 'Rx GPIO is required' }, GPIO_VALIDATORS2]
-      }),
+    ...(settings.board_profile === 'CUSTOM' && {
+      led_gpio: [{ required: true, message: 'LED GPIO is required' }, GPIO_VALIDATOR],
+      dallas_gpio: [{ required: true, message: 'GPIO is required' }, GPIO_VALIDATOR],
+      pbutton_gpio: [{ required: true, message: 'Button GPIO is required' }, GPIO_VALIDATOR],
+      tx_gpio: [{ required: true, message: 'Tx GPIO is required' }, GPIO_VALIDATOR],
+      rx_gpio: [{ required: true, message: 'Rx GPIO is required' }, GPIO_VALIDATOR]
+    }),
    ...(settings.syslog_enabled && {
      syslog_host: [{ required: true, message: 'Host is required' }, IP_OR_HOSTNAME_VALIDATOR],
      syslog_port: [
        { required: true, message: 'Port is required' },
-        { type: 'number', min: 0, max: 65535, message: 'Invalid Port' }
+        { type: 'number', min: 0, max: 65535, message: 'Port must be between 0 and 65535' }
      ],
      syslog_mark_interval: [
        { required: true, message: 'Mark interval is required' },
-        { type: 'number', min: 0, max: 10, message: ' must be between 0 and 10' }
+        { type: 'number', min: 0, max: 10, message: 'Port must be between 0 and 10' }
      ]
    }),
    ...(settings.shower_alert && {
--- a/interface/src/types/mqtt.ts
+++ b/interface/src/types/mqtt.ts
@@ -15,8 +15,6 @@ export interface MqttStatus {
  client_id: string;
  disconnect_reason: MqttDisconnectReason;
  mqtt_fails: number;
-  mqtt_queued: number;
-  connect_count: number;
 }

 export interface MqttSettings {
@@ -29,14 +27,13 @@ export interface MqttSettings {
  client_id: string;
  keep_alive: number;
  clean_session: boolean;
-  entity_format: number;
+  max_topic_length: number;
  publish_time_boiler: number;
  publish_time_thermostat: number;
  publish_time_solar: number;
  publish_time_mixer: number;
  publish_time_other: number;
  publish_time_sensor: number;
-  publish_time_heartbeat: number;
  mqtt_qos: number;
  mqtt_retain: boolean;
  ha_enabled: boolean;
--- a/interface/src/types/network.ts
+++ b/interface/src/types/network.ts
@@ -48,8 +48,6 @@ export interface NetworkSettings {
  dns_ip_1?: string;
  dns_ip_2?: string;
  enableMDNS: boolean;
-  enableCORS: boolean;
-  CORSOrigin: string;
 }

 export interface WiFiNetworkList {
--- a/interface/src/types/system.ts
+++ b/interface/src/types/system.ts
@@ -1,23 +1,36 @@
-export interface SystemStatus {
+export enum EspPlatform {
+  ESP8266 = 'esp8266',
+  ESP32 = 'esp32'
+}
+
+interface ESPSystemStatus {
  emsesp_version: string;
-  esp_platform: string;
+  esp_platform: EspPlatform;
  max_alloc_heap: number;
  cpu_freq_mhz: number;
  free_heap: number;
  sdk_version: string;
  flash_chip_size: number;
  flash_chip_speed: number;
-  app_used: number;
-  app_free: number;
  fs_used: number;
-  fs_free: number;
+  fs_total: number;
  uptime: string;
  free_mem: number;
-  psram_size?: number;
-  free_psram?: number;
-  has_loader: boolean;
 }

+export interface ESP32SystemStatus extends ESPSystemStatus {
+  esp_platform: EspPlatform.ESP32;
+  psram_size: number;
+  free_psram: number;
+}
+
+export interface ESP8266SystemStatus extends ESPSystemStatus {
+  esp_platform: EspPlatform.ESP8266;
+  heap_fragmentation: number;
+}
+
+export type SystemStatus = ESP8266SystemStatus | ESP32SystemStatus;
+
 export interface OTASettings {
  enabled: boolean;
  port: number;
--- a/interface/src/utils/endpoints.ts
+++ b/interface/src/utils/endpoints.ts
@@ -1,6 +1,8 @@
-export const extractErrorMessage = (error: any, defaultMessage: string) => {
-  if (error.request) {
-    return defaultMessage + ' (' + error.request.status + ': ' + error.request.statusText + ')';
+import { AxiosError } from 'axios';
+
+export const extractErrorMessage = (error: unknown, defaultMessage: string) => {
+  if (error instanceof AxiosError) {
+    return defaultMessage + ' (' + error.request.statusText + ')';
  } else if (error instanceof Error) {
    return defaultMessage + ' (' + error.message + ')';
  }
--- a/interface/src/utils/index.ts
+++ b/interface/src/utils/index.ts
@@ -5,3 +5,4 @@ export * from './submit';
 export * from './time';
 export * from './useRest';
 export * from './props';
+
--- a/interface/src/utils/time.ts
+++ b/interface/src/utils/time.ts
@@ -1,3 +1,5 @@
+import parseMilliseconds from 'parse-ms';
+
 const LOCALE_FORMAT = new Intl.DateTimeFormat([...window.navigator.languages], {
  day: 'numeric',
  month: 'short',
@@ -19,6 +21,21 @@ export const formatLocalDateTime = (date: Date) => {
 export const pluralize = (count: number, noun: string) =>
  `${Intl.NumberFormat().format(count)} ${noun}${count !== 1 ? 's' : ''}`;

+export const formatDurationMin = (duration_min: number) => {
+  const { days, hours, minutes } = parseMilliseconds(duration_min * 60000);
+  let formatted = '';
+  if (days) {
+    formatted += pluralize(days, 'day') + ' ';
+  }
+  if (hours) {
+    formatted += pluralize(hours, 'hour') + ' ';
+  }
+  if (minutes) {
+    formatted += pluralize(minutes, 'minute') + ' ';
+  }
+  return formatted;
+};
+
 export const formatDurationSec = (duration_sec: number) => {
  if (duration_sec === 0) {
    return ' ';
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Proddy	a47e0e8266	update for 3.4.0	2022-05-23 21:20:45 +02:00
Proddy	f412ddc716	Merge remote-tracking branch 'origin/dev' into main	2022-05-23 21:20:36 +02:00
proddy	29110e96e5	Merge remote-tracking branch 'origin/dev'	2022-01-20 10:51:40 +01:00
proddy	b65866217a	3.4.0	2021-11-28 23:03:28 +01:00
proddy	611e3b1243	Merge remote-tracking branch 'origin/dev'	2021-11-28 23:03:15 +01:00
proddy	2ca0a0c634	v3.2.1 merged from dev	2021-08-08 14:46:14 +02:00
proddy	7eb1f061b7	Merge remote-tracking branch 'origin/dev' for 3.2.0 release	2021-08-06 12:06:08 +02:00
proddy	50459a23fe	force v16 of nodejs	2021-06-26 11:13:07 +02:00
proddy	5bf53c3389	3.1.1	2021-06-26 11:03:03 +02:00
proddy	4b7aa95be3	Merge remote-tracking branch 'origin/dev'	2021-06-26 11:02:55 +02:00
Proddy	70943f5758	Update pre_release.yml	2021-05-16 15:52:09 +02:00
Proddy	3bc280b817	Delete check_code.yml	2021-05-16 15:51:56 +02:00
Proddy	62b15a5319	Update pre_release.yml	2021-05-16 15:35:06 +02:00
Proddy	8dd18802d6	Update tagged_release.yml	2021-05-16 15:34:45 +02:00
proddy	57a516a83a	updated README and images	2021-05-09 15:13:16 +02:00
proddy	a57fdaa4b3	Merge remote-tracking branch 'origin/dev' into main	2021-05-04 12:21:51 +02:00
proddy	4841e42286	Merge remote-tracking branch 'origin/dev' into main	2021-03-30 16:35:18 +02:00
proddy	8c2d2b06ed	cleaned up old changelog	2021-03-18 20:59:09 +01:00
proddy	38c8b1b7f0	3.0.0	2021-03-18 20:58:21 +01:00
proddy	6fb5933a02	Merge remote-tracking branch 'origin/dev' into main	2021-03-18 20:58:12 +01:00
proddy	c0944433be	remove workspace.code-workspace	2021-03-16 17:41:42 +01:00
Proddy	478e6362c9	Merge pull request #27 from FauthD:main Add global names to Dallas sensors to avoid ugly <unknown> and other …	2021-03-16 17:39:00 +01:00
fauthd	4d6354db78	Add stuff to gitignore, add vscode workspace	2021-03-16 16:47:09 +01:00
fauthd	beab0f0c77	Add global names to Dallas sensors to avoid ugly <unknown> and other issues in HA	2021-03-16 16:00:23 +01:00
Proddy	c17749bd22	Update README.md	2021-03-14 23:43:33 +01:00
proddy	2bad769c5c	build: include assets	2021-03-14 21:20:51 +01:00
proddy	8ad89ca64b	move repo	2021-03-14 21:05:15 +01:00
proddy	9244d8daec	Semantic Commit Messages	2021-03-14 18:10:57 +01:00
proddy	02d01334b2	update new build	2021-03-14 17:37:18 +01:00
				`@@ -1 +0,0 @@`
				`<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 85.333 512 341.333"><path fill="#D80027" d="M0 85.331h512v341.337H0z"/><path d="M0 85.331h512v113.775H0z"/><path fill="#FFDA44" d="M0 312.882h512v113.775H0z"/></svg>`
				`@@ -1 +0,0 @@`
				<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 85.333 512 341.333"><path fill="#FFF" d="M0 85.333h512V426.67H0z"/><path fill="#D80027" d="M288 85.33h-64v138.666H0v64h224v138.666h64V287.996h224v-64H288z"/><g fill="#0052B4"><path d="M393.785 315.358 512 381.034v-65.676zM311.652 315.358 512 426.662v-31.474l-143.693-79.83zM458.634 426.662l-146.982-81.664v81.664z"/></g><path fill="#FFF" d="M311.652 315.358 512 426.662v-31.474l-143.693-79.83z"/><path fill="#D80027" d="M311.652 315.358 512 426.662v-31.474l-143.693-79.83z"/><g fill="#0052B4"><path d="M90.341 315.356 0 365.546v-50.19zM200.348 329.51v97.151H25.491z"/></g><path fill="#D80027" d="M143.693 315.358 0 395.188v31.474l200.348-111.304z"/><g fill="#0052B4"><path d="M118.215 196.634 0 130.958v65.676zM200.348 196.634 0 85.33v31.474l143.693 79.83zM53.366 85.33l146.982 81.664V85.33z"/></g><path fill="#FFF" d="M200.348 196.634 0 85.33v31.474l143.693 79.83z"/><path fill="#D80027" d="M200.348 196.634 0 85.33v31.474l143.693 79.83z"/><g fill="#0052B4"><path d="M421.659 196.636 512 146.446v50.19zM311.652 182.482V85.331h174.857z"/></g><path fill="#D80027" d="M368.307 196.634 512 116.804V85.33L311.652 196.634z"/></svg>