Merge pull request #3270 from proddy/dev

A few changes for 3094, 3258, 3257
update dev-16
2026-10-28 11:14:58 +00:00 · 2026-10-08 18:08:26 +02:00 · 2026-10-08 18:03:46 +02:00 · 2026-10-08 18:03:38 +02:00 · 2026-10-06 21:42:51 +02:00 · 2026-10-04 14:29:17 +02:00
329 changed files with 23001 additions and 18210 deletions
@@ -29,7 +29,7 @@ BreakBeforeBinaryOperators: NonAssignment
 BreakConstructorInitializersBeforeComma: true # Always break constructor initializers before commas and align the commas with the colon.
 ExperimentalAutoDetectBinPacking: false
 KeepEmptyLinesAtTheStartOfBlocks: false
-MaxEmptyLinesToKeep: 4
+MaxEmptyLinesToKeep: 1
 PenaltyBreakBeforeFirstCallParameter: 200
 PenaltyExcessCharacter: 10
 PointerAlignment: Middle
@@ -1,8 +1,10 @@
 {
 	"name": "EMS-ESP Devcontainer",
-	"image": "mcr.microsoft.com/devcontainers/typescript-node:1-22-bookworm",
+	"image": "mcr.microsoft.com/devcontainers/typescript-node:5-26-bookworm",
 	"features": {
-		"ghcr.io/devcontainers/features/node:1": {},
+		"ghcr.io/devcontainers/features/node:1": {
+			"version": "26"
+		},
 		"ghcr.io/devcontainers-extra/features/pnpm:2": {},
 		"ghcr.io/devcontainers/features/python:1": {},
 		"ghcr.io/shyim/devcontainers-features/bun:0": {}
@@ -14,24 +14,27 @@ permissions:
 jobs:
  pre-release:
    name: 'Build Dev Release'
+    if: github.event_name == 'workflow_dispatch' || github.repository == 'emsesp/EMS-ESP32'
    runs-on: ubuntu-latest
    steps:
        
      - name: Install python 3.13
-        uses: actions/setup-python@v6
+        uses: actions/setup-python@v7
        with:
          python-version: '3.13'

-      - name: Install Node.js 24
-        uses: actions/setup-node@v6
+      - name: Install Node.js 26
+        uses: actions/setup-node@v7
        with:
-          node-version: 24
+          node-version: 26

      - name: Checkout repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
+        with:
+          fetch-depth: 0
  
-      - name: Enable Corepack
-        run: corepack enable pnpm
+      - name: Install pnpm
+        run: npm install -g pnpm

      - name: Get the EMS-ESP version
        id: build_info
@@ -39,6 +42,13 @@ jobs:
          version=`grep -E '^#define EMSESP_APP_VERSION' ./src/emsesp_version.h | awk -F'"' '{print $2}'`
          echo "VERSION=$version" >> $GITHUB_OUTPUT

+      # must run before the release moves the 'latest' tag to this build
+      - name: Find the previous dev release
+        id: previous
+        run: |
+          prev=`git rev-parse -q --verify 'refs/tags/latest^{commit}' || git describe --tags --abbrev=0 --match 'v*'`
+          echo "REF=$prev" >> $GITHUB_OUTPUT
+
      - name: Install PlatformIO
        run: |
          python -m pip install --upgrade pip
@@ -66,14 +76,50 @@ jobs:
        with:
          commit_message: "chore: update generated files for v${{steps.build_info.outputs.VERSION}}"

+      # an empty body falls back to the commit list generated by the release action
+      - name: Build the release notes
+        id: notes
+        env:
+          PREV_REF: ${{ steps.previous.outputs.REF }}
+          VERSION: ${{ steps.build_info.outputs.VERSION }}
+        run: |
+          ./scripts/release_notes.sh "$PREV_REF" "$VERSION" > release_notes.md || :
+          cat release_notes.md
+          {
+            echo 'BODY<<__RELEASE_NOTES_EOF__'
+            cat release_notes.md
+            echo '__RELEASE_NOTES_EOF__'
+          } >> $GITHUB_OUTPUT
+
      - name: Create GitHub Release
        id: 'automatic_releases'
        uses: emsesp/action-automatic-releases@v1.0.1
        with:
          repo_token: '${{ secrets.GITHUB_TOKEN }}'
          title: Development Build v${{steps.build_info.outputs.VERSION}}
+          body: ${{ steps.notes.outputs.BODY }}
          automatic_release_tag: 'latest'
          prerelease: true
          files: |
            CHANGELOG_LATEST.md
            ./build/firmware/*.*
+
+      - name: Update version in Cloudflare KV store
+        if: github.repository == 'emsesp/EMS-ESP32'
+        env:
+          CF_ACCOUNT_ID: ${{ secrets.CF_ACCOUNT_ID }}
+          CF_NAMESPACE_ID: ${{ secrets.CF_NAMESPACE_ID }}
+          CF_API_TOKEN: ${{ secrets.CF_API_TOKEN }}
+          VERSION: ${{ steps.build_info.outputs.VERSION }}
+        run: |
+          JSON_DATA=$(jq -n \
+            --arg version "$VERSION" \
+            --arg date "$(date -u +%Y-%m-%dT%H:%M:%SZ)" \
+            '{version: $version, date: $date}')
+          echo "JSON_DATA: $JSON_DATA"
+          curl -sS --fail-with-body \
+            -X PUT "https://api.cloudflare.com/client/v4/accounts/${CF_ACCOUNT_ID}/storage/kv/namespaces/${CF_NAMESPACE_ID}/values/dev" \
+            -H "Authorization: Bearer ${CF_API_TOKEN}" \
+            -H "Content-Type: application/json" \
+            -d "$JSON_DATA"
+          echo
@@ -11,10 +11,10 @@ jobs:
      contents: read
    steps:
      - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
        
      - name: GitHub Releases To Discord
-        uses: SethCohen/github-releases-to-discord@v1.13.1
+        uses: SethCohen/github-releases-to-discord@v1.20.0
        with:
          webhook_url: ${{ secrets.WEBHOOK_URL }}
          color: '2105893'
@@ -15,10 +15,10 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7

      - name: Install python 3.13
-        uses: actions/setup-python@v6
+        uses: actions/setup-python@v7
        with:
          python-version: '3.13'

@@ -19,15 +19,15 @@ jobs:
      BUILD_WRAPPER_OUT_DIR: bw-output
    steps:
      - name: Checkout repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
        with:
          fetch-depth: 0
      - name: Install Build Wrapper
-        uses: SonarSource/sonarqube-scan-action/install-build-wrapper@master
+        uses: SonarSource/sonarqube-scan-action/install-build-wrapper@v8.2.2
      - name: Run Build Wrapper
        run: build-wrapper-linux-x86-64 --out-dir ${{ env.BUILD_WRAPPER_OUT_DIR }} make all
      - name: SonarQube Scan
-        uses: SonarSource/sonarqube-scan-action@master
+        uses: SonarSource/sonarqube-scan-action@v8.2.2
        env:
          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
            
@@ -16,20 +16,27 @@ jobs:
    steps:

      - name: Install python 3.13
-        uses: actions/setup-python@v6
+        uses: actions/setup-python@v7
        with:
          python-version: '3.13'

-      - name: Install Node.js 24
-        uses: actions/setup-node@v6
+      - name: Install Node.js 26
+        uses: actions/setup-node@v7
        with:
-          node-version: 24
+          node-version: 26

      - name: Checkout repository
-        uses: actions/checkout@v6
-  
-      - name: Enable Corepack
-        run: corepack enable pnpm
+        uses: actions/checkout@v7
+
+      - name: Install pnpm
+        run: npm install -g pnpm
+
+
+      - name: Get the EMS-ESP version
+        id: build_info
+        run: |
+          version=`grep -E '^#define EMSESP_APP_VERSION' ./src/emsesp_version.h | awk -F'"' '{print $2}'`
+          echo "VERSION=$version" >> $GITHUB_OUTPUT

      - name: Install PlatformIO
        run: |
@@ -61,3 +68,23 @@ jobs:
          files: |
            CHANGELOG.md
            ./build/firmware/*.*
+
+      - name: Update version in Cloudflare KV store
+        if: github.repository == 'emsesp/EMS-ESP32'
+        env:
+          CF_ACCOUNT_ID: ${{ secrets.CF_ACCOUNT_ID }}
+          CF_NAMESPACE_ID: ${{ secrets.CF_NAMESPACE_ID }}
+          CF_API_TOKEN: ${{ secrets.CF_API_TOKEN }}
+          VERSION: ${{ steps.build_info.outputs.VERSION }}
+        run: |
+          JSON_DATA=$(jq -n \
+            --arg version "$VERSION" \
+            --arg date "$(date -u +%Y-%m-%dT%H:%M:%SZ)" \
+            '{version: $version, date: $date}')
+          echo "JSON_DATA: $JSON_DATA"
+          curl -sS --fail-with-body \
+            -X PUT "https://api.cloudflare.com/client/v4/accounts/${CF_ACCOUNT_ID}/storage/kv/namespaces/${CF_NAMESPACE_ID}/values/stable" \
+            -H "Authorization: Bearer ${CF_API_TOKEN}" \
+            -H "Content-Type: application/json" \
+            -d "$JSON_DATA"
+          echo
@@ -12,7 +12,7 @@ jobs:
  stale:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/stale@v10
+      - uses: actions/stale@v11
        with:
          repo-token: ${{ secrets.GITHUB_TOKEN }}
          days-before-stale: 30
@@ -18,20 +18,20 @@ jobs:
    steps:

      - name: Install python 3.13
-        uses: actions/setup-python@v6
+        uses: actions/setup-python@v7
        with:
          python-version: '3.13'

-      - name: Install Node.js 24
-        uses: actions/setup-node@v6
+      - name: Install Node.js 26
+        uses: actions/setup-node@v7
        with:
-          node-version: 24
+          node-version: 26

      - name: Checkout repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7

-      - name: Enable Corepack
-        run: corepack enable pnpm
+      - name: Install pnpm
+        run: npm install -g pnpm

      - name: Get the EMS-ESP version
        id: build_info
@@ -0,0 +1,40 @@
+name: 'Update versions'
+
+on:
+  workflow_dispatch:
+
+permissions:
+  contents: write
+
+jobs:
+  update-version:
+    name: 'Update versions in Cloudflare KV store'
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v7
+
+      - name: Get and Send EMS-ESP version to Cloudflare
+        env:
+          CF_ACCOUNT_ID: ${{ secrets.CF_ACCOUNT_ID }}
+          CF_NAMESPACE_ID: ${{ secrets.CF_NAMESPACE_ID }}
+          CF_API_TOKEN: ${{ secrets.CF_API_TOKEN }}
+        run: |
+          version=$(grep -E '^#define EMSESP_APP_VERSION' ./src/emsesp_version.h | awk -F'"' '{print $2}')
+          if [ "$GITHUB_REF" = "refs/heads/main" ]; then
+            KV_ENV="stable"
+          else
+            KV_ENV="dev"
+          fi
+          JSON_DATA=$(jq -n \
+            --arg version "$version" \
+            --arg date "$(date -u +%Y-%m-%dT%H:%M:%SZ)" \
+            '{version: $version, date: $date}')
+          echo "KV_ENV: $KV_ENV"
+          echo "JSON_DATA: $JSON_DATA"
+          curl -sS --fail-with-body \
+            -X PUT "https://api.cloudflare.com/client/v4/accounts/${CF_ACCOUNT_ID}/storage/kv/namespaces/${CF_NAMESPACE_ID}/values/${KV_ENV}" \
+            -H "Authorization: Bearer ${CF_API_TOKEN}" \
+            -H "Content-Type: application/json" \
+            -d "$JSON_DATA"
+          echo
@@ -2,6 +2,7 @@
 .vscode/c_cpp_properties.json
 .vscode/extensions.json
 .vscode/launch.json
+.vscode/settings.json

 # c++ compiling
 .clang_complete
@@ -63,7 +64,7 @@ words-found-verbose.txt
 # sonarlint
 compile_commands.json

-# pioarduino + hybrid
+# other files
 managed_components
 dependencies.lock
 CMakeLists.txt
@@ -75,3 +76,6 @@ pnpm-lock.yaml
 .cache/
 interface/.tsbuildinfo
 test/test_api/package-lock.json
+.clangd
+mklittlefs
+.cursor
@@ -1,101 +0,0 @@
-{
-    "search.exclude": {
-      "**/.yarn": true,
-      "**/.pnp.*": true
-    },
-    "editor.codeActionsOnSave": {
-      "source.fixAll": "explicit"
-    },
-    "eslint.validate": [
-      "typescript"
-    ],
-    "eslint.codeActionsOnSave.rules": null,
-    "eslint.nodePath": "interface/.yarn/sdks",
-    "eslint.workingDirectories": ["interface"],
-    "prettier.prettierPath": "",
-    "typescript.enablePromptUseWorkspaceTsdk": true,
-    "files.associations": {
-      "*.tsx": "typescriptreact",
-      "*.tcc": "cpp",
-      "optional": "cpp",
-      "istream": "cpp",
-      "ostream": "cpp",
-      "ratio": "cpp",
-      "system_error": "cpp",
-      "array": "cpp",
-      "functional": "cpp",
-      "regex": "cpp",
-      "tuple": "cpp",
-      "type_traits": "cpp",
-      "utility": "cpp",
-      "string": "cpp",
-      "string_view": "cpp",
-      "atomic": "cpp",
-      "bitset": "cpp",
-      "cctype": "cpp",
-      "chrono": "cpp",
-      "clocale": "cpp",
-      "cmath": "cpp",
-      "condition_variable": "cpp",
-      "cstdarg": "cpp",
-      "cstddef": "cpp",
-      "cstdint": "cpp",
-      "cstdio": "cpp",
-      "cstdlib": "cpp",
-      "cstring": "cpp",
-      "ctime": "cpp",
-      "cwchar": "cpp",
-      "cwctype": "cpp",
-      "deque": "cpp",
-      "list": "cpp",
-      "unordered_map": "cpp",
-      "unordered_set": "cpp",
-      "vector": "cpp",
-      "exception": "cpp",
-      "algorithm": "cpp",
-      "iterator": "cpp",
-      "map": "cpp",
-      "memory": "cpp",
-      "memory_resource": "cpp",
-      "numeric": "cpp",
-      "random": "cpp",
-      "set": "cpp",
-      "fstream": "cpp",
-      "initializer_list": "cpp",
-      "iomanip": "cpp",
-      "iosfwd": "cpp",
-      "iostream": "cpp",
-      "limits": "cpp",
-      "mutex": "cpp",
-      "new": "cpp",
-      "sstream": "cpp",
-      "stdexcept": "cpp",
-      "streambuf": "cpp",
-      "thread": "cpp",
-      "cinttypes": "cpp",
-      "typeinfo": "cpp"
-    },
-    "todo-tree.filtering.excludeGlobs": [
-      "**/vendor/**",
-      "**/node_modules/**",
-      "**/dist/**",
-      "**/bower_components/**",
-      "**/build/**",
-      "**/.vscode/**",
-      "**/.github/**",
-      "**/_output/**",
-      "**/*.min.*",
-      "**/*.map",
-      "**/ArduinoJson/**"
-    ],
-    "cSpell.enableFiletypes": [
-      "ini",
-      "makefile"
-    ],
-    "typescript.preferences.preferTypeOnlyAutoImports": true,
-    "sonarlint.pathToCompileCommands": "${workspaceFolder}/compile_commands.json",
-    "sonarlint.connectedMode.project": {
-      "connectionId": "emsesp",
-      "projectKey": "emsesp_EMS-ESP32"
-    }
-  }
@@ -5,6 +5,18 @@ 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.8.6] 24 September 2026
+
+## Added
+
+- own rgb_led library supporting WS2812B V5 and the newer V6 RGB LEDs
+
+## [3.8.5] 22 September 2026
+
+## Added
+
+- Change webUI message when upgrading to a major version of the firmware, in preparation for the upcoming 3.9.0 release.
+
 ## [3.8.4] 4 August 2026

 ## Fixed
@@ -41,7 +53,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - set 10 sec timeout for http requests [#3104](https://github.com/emsesp/EMS-ESP32/issues/3104)
 - language code "cs" [#3161](https://github.com/emsesp/EMS-ESP32/issues/3161)

-
 ## [3.8.2] 12 May 2026

 ## Added
@@ -108,6 +119,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - board profile `CUSTOM` can only be selected in developer mode
 - mqtt sends round values without decimals (`28` instead of `28.0`)

+
 ## [3.8.0] 31 December 2025

 ## Added
@@ -981,4 +993,4 @@ There are breaking changes between 3.5.x and earlier versions of 3.6.0. Please r
 - 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>
+- moved to a new GitHub repo <https://github.com/emsesp/EMS-ESP32>
@@ -1,3 +1,63 @@
 # Changelog

 For more details go to [emsesp.org](https://emsesp.org/).
+
+## [3.9.0]
+
+This release is based on the latest Espressif/Arduino core version 3. It brings in many memory and performance optimizations.
+
+## Added
+
+- user-requested LED blink [#3063](https://github.com/emsesp/EMS-ESP32/issues/3063)
+- Commands Service that can be called via MQTT or API or used in the Scheduler Service
+- option to disable factory reset [#3150](https://github.com/emsesp/EMS-ESP32/issues/3150)
+- TLS support with 4MB boards without PSRAM
+- added eth_10mbit to Network Settings, which forces 10BASE-T half-duplex & autonegotiation off, halving the PHY’s power draw. It’s off by default as it will cause issues on managed switches with a port forced to 100Mb [#3213](https://github.com/emsesp/EMS-ESP32/pull/3213)
+- cleaner MD5 and firmware uploading in WebUI [#3222](https://github.com/emsesp/EMS-ESP32/issues/3222)
+- pc0Flow in l/min [#3224](https://github.com/emsesp/EMS-ESP32/issues/3224)
+- remove HA config for excluded entities [#3229](https://github.com/emsesp/EMS-ESP32/issues/3229)
+- `show system` reports the Ethernet status on boards with a PHY, so a failed initialisation or a link that never came up is visible instead of Ethernet being omitted completely. Also shows the loop task's lowest free stack, to help diagnose reboots
+- new Application Setting "Automatically check for firmware updates", off by default. When enabled EMS-ESP asks emsesp.org for the latest version once a day on its own, otherwise it only asks when the WebUI wants to show it, so an unattended system never contacts emsesp.org
+- Automatically check and convert older 3.8.x filesystem to the new 3.9.0 format
+- heatpump pool: `poolon` (switch, 0x48A), `hppoolon` (pool heating active, 0x488), MP100 `poolshuntset` (0x5C4) and `poolrequest` (0x5BA), shorter pool names
+
+## Fixed
+
+- shunting yard show json
+- `system/sendmail` called from a Command or the Scheduler computed its value twice, which stripped the quotes from literal text and then failed on characters like `!`. Also shunting yard treated a `?` inside a quoted string as a ternary, so text like `"too hot?"` returned nothing
+- memory leak when using different timezones for ems-esp and thermostat[#3184](https://github.com/emsesp/EMS-ESP32/issues/3184)
+- LED stayed off on a healthy system when "Disable LED" was unchecked
+- Ethernet MAC address changed with the new SDK, breaking DHCP reservations (currently disabled)
+- "IPv4 nameserver" showed an IPv6 address when IPv6 was in use
+- the Network status page showed at most one IPv6 address and could hide the IPv4 DNS server entirely. It only read the link-local address, so a dual-stack host's ULA and global addresses were never reported, and it only read two of the three DNS slots, which are shared between IPv4 and IPv6. It now lists every address the interface holds, each labelled with its IPv6 scope, and every configured DNS server [#3246](https://github.com/emsesp/EMS-ESP32/issues/3246)
+- the Gateway was only ever reported for IPv4, so on a dual-stack network the IPv6 default router was missing from the Network status page, `show system` and the MQTT `info` topic. Routers are learnt from router advertisements rather than configured, so all of them are now listed [#3246](https://github.com/emsesp/EMS-ESP32/issues/3246)
+- `show system` had the same gaps, reporting a link-local IPv6 address only and a single IPv4 DNS server. The WiFi and Ethernet sections now list every IPv6 address with its scope, and every DNS server labelled with its own family [#3246](https://github.com/emsesp/EMS-ESP32/issues/3246)
+- the Access Point status page reported whichever interface happened to be active, so with the AP down it showed the station's IP and MAC address under an "Inactive" heading. It now always reports the soft-AP's own details, and shows `none` when the AP isn't running
+- the MQTT `info` topic published no addresses at all when connected over Ethernet, and over WiFi only an IPv4 address plus a link-local IPv6 one. Both interfaces now report their MAC, IPv4 address and gateway, every IPv6 address and every DNS server. Note that `IPv6 address` is now an array, and `IPv4 DNS Server` is replaced by a `DNS Server` array that covers both families [#3246](https://github.com/emsesp/EMS-ESP32/issues/3246)
+- HA Discovery warning on Uptime after EMS-ESP boot due to NTP not ready
+- hc/control setting for UI800 thermostats [#3181](https://github.com/emsesp/EMS-ESP32/discussions/3181)
+- solar module switches [#3223](https://github.com/emsesp/EMS-ESP32/issues/3223)
+- UI800/HMI800.2 thermostats without telegram 0x470 reported `summertemp` as 0 and lost the per-hc heat/cool delays. `summermode` is now also shown for UI800 heatpumps [#3257](https://github.com/emsesp/EMS-ESP32/issues/3257)
+- possible crash when the WebUI asked for version information while the versions.json refresh was rewriting the cache from the main loop task
+- HTTP client could write past a fixed 64 byte buffer when a URL had a hostname of 64 characters or more, could busy-spin for the whole read budget if the socket reported bytes it wouldn't return, and buffered responses without any size limit
+- the "Ethernet clock mode (GPIO16/17) conflicts with PSRAM" error was never logged because Ethernet had already been skipped by the time the check ran
+- heat limit entities (`maxheatcomp`, `maxheatheat`, `dhw.maxheat`) read as unknown on heat pumps with an auxiliary heater larger than 9 kW - `enum_maxHeat` was missing the 12 kW and 15 kW steps
+- no EMS bus on custom boards whose interface relies on a pull-up on the Rx line. The newer ESP-IDF no longer enables the internal pull-up on the UART Rx pin, so it is now set explicitly as it was in 3.8 [#3258](https://github.com/emsesp/EMS-ESP32/discussions/3258)
+
+## Changed
+
+- various memory optimizations [#3083](https://github.com/emsesp/EMS-ESP32/issues/3083)
+- Scheduler name is now mandatory
+- network fallback to AP only after start [#3090](https://github.com/emsesp/EMS-ESP32/issues/3090)
+- replaced Web async-validator with custom validator and toast with native snackbar to reduce bundle size
+- Gateway and Connect devices are shown in the Devices page, but disabled [3126](https://github.com/emsesp/EMS-ESP32/discussions/3126)
+- show control setting only for master thermostats (0x10) [#3173](https://github.com/emsesp/EMS-ESP32/issues/3173)
+- remove devices without entities not listed in 0x07 telegram
+- changes to the Dialogs in Dashboard page, removed the run icon in the Commands page. Renamed Execute to Run.
+- set `None` for undefined values in HA `val_tpl`
+- changes in WebUI - remove multiple calls systemInfo endpoint, Vewrsion pages checks for internet connection [#3195](https://github.com/emsesp/EMS-ESP32/pull/3195)
+- multiple optimization in network, power down WiFi when Ethernet and WiFi nosleep is instant when selected [#3213](https://github.com/emsesp/EMS-ESP32/pull/3213)
+- TLS buffers (~17KB per HTTPS request) are taken from PSRAM on boards that have it, instead of fragmenting the internal heap
+- failed versions.json fetches back off from 5 up to 160 minutes instead of retrying every 5 minutes, as each attempt blocks the main loop for as long as the DNS, connect and read timeouts allow
+- optimized the LED library to support WS2812B V5 and the newer V6 RGB LEDs
+- hold Tx while a K30RF/KM200 gateway is syncing [#3094](https://github.com/emsesp/EMS-ESP32/issues/3094)
@@ -27,7 +27,7 @@ ifeq ($(UNAME_S),Linux)
 	JOBS := $(shell nproc)
 endif
 ifeq ($(UNAME_S),Darwin)
-    EXTRA_CPPFLAGS = -D OSX -Wno-tautological-constant-out-of-range-compare
+    EXTRA_CPPFLAGS = -D OSX -Wno-tautological-constant-out-of-range-compare -Wno-unused-lambda-capture
 	JOBS := $(shell sysctl -n hw.ncpu)
 endif

@@ -47,7 +47,7 @@ MAKEFLAGS += -j$(JOBS) -l$(shell echo $$(($(JOBS) * 2)))
 #----------------------------------------------------------------------
 TARGET    := emsesp
 BUILD     := build
-SOURCES   := src/core src/devices src/web src/test lib_standalone lib/espMqttClient/src lib/espMqttClient/src/*         lib/ArduinoJson/src lib/uuid-common/src lib/uuid-console/src lib/uuid-log/src   lib/PButton 
+SOURCES   := src/core src/devices src/web src/test lib_standalone       lib/espMqttClient/src lib/espMqttClient/src/*         lib/ArduinoJson/src lib/uuid-common/src lib/uuid-console/src lib/uuid-log/src   lib/PButton 
 INCLUDES  := src/core src/devices src/web src/test lib_standalone lib/* lib/espMqttClient/src lib/espMqttClient/src/Transport lib/ArduinoJson/src lib/uuid-common/src lib/uuid-console/src lib/uuid-log/src   lib/uuid-telnet/src lib/uuid-syslog/src
 LIBRARIES :=

@@ -65,7 +65,6 @@ CXX_STANDARD := -std=gnu++20
 #----------------------------------------------------------------------
 DEFINES += -DARDUINOJSON_ENABLE -DARDUINOJSON_ENABLE_ARDUINO_STRING -DARDUINOJSON_USE_DOUBLE=0 
 DEFINES += -DEMSESP_STANDALONE -DEMSESP_TEST -DEMSESP_DEBUG -DEMC_RX_BUFFER_SIZE=1500
-DEFINES += -DNO_TLS_SUPPORT
 DEFINES += $(ARGS)

 DEFAULTS = -DEMSESP_DEFAULT_LOCALE=\"en\" -DEMSESP_DEFAULT_BOARD_PROFILE=\"S32S3\"
@@ -113,8 +112,8 @@ CXX := /usr/bin/g++
 CPPFLAGS  += $(DEFINES) $(DEFAULTS) $(INCLUDE)
 CPPFLAGS  += -ggdb -g3 -MMD
 CPPFLAGS  += -flto=auto
-CPPFLAGS  += -Wall -Wextra -Werror -Wswitch-enum
-CPPFLAGS  += -Wno-unused-parameter -Wno-missing-braces -Wno-vla-cxx-extension
+CPPFLAGS  += -Wall -Wextra -Werror
+CPPFLAGS  += -Wno-unused-parameter -Wno-missing-braces -Wno-vla-cxx-extension -Wno-switch-enum
 CPPFLAGS  += -ffunction-sections -fdata-sections -fno-exceptions -fno-rtti -fno-threadsafe-statics
 CPPFLAGS  += -Os -DNDEBUG

@@ -5,7 +5,6 @@
      },
      "core": "esp32",
      "extra_flags": [
-        "-DTASMOTA_SDK",
        "-DARDUINO_LOLIN_C3_MINI",
        "-DARDUINO_USB_MODE=1",
        "-DARDUINO_USB_CDC_ON_BOOT=1"
@@ -6,7 +6,6 @@
      "core": "esp32",
      "extra_flags": [
        "-DBOARD_HAS_PSRAM",
-        "-DTASMOTA_SDK",
        "-DARDUINO_USB_CDC_ON_BOOT=1",
        "-DARDUINO_USB_MODE=0"
      ],
@@ -21,7 +21,7 @@
      "arduino",
      "espidf"
    ],
-    "name": "Espressif ESP32-S3 32M Flash OPI PSRAM, 4608KB Code/OTA, 2MB FS",
+    "name": "Tasmota ESP32-S3 32M Flash OPI PSRAM, 4608KB Code/OTA, 2MB FS",
    "upload": {
      "flash_size": "32MB",
      "maximum_ram_size": 327680,
@@ -1,7 +1,6 @@
 {
    "build": {
      "core": "esp32",
-      "extra_flags": "-DTASMOTA_SDK",
      "f_cpu": "240000000L",
      "f_flash": "40000000L",
      "flash_mode": "dio",
@@ -19,7 +18,7 @@
      "arduino",
      "espidf"
    ],
-    "name": "Espressif ESP32 16M Flash, 4608KB Code/OTA, 2MB FS",
+    "name": "Tasmota ESP32 16M Flash, 4608KB Code/OTA, 2MB FS",
    "upload": {
      "flash_size": "16MB",
      "maximum_ram_size": 327680,
@@ -19,7 +19,7 @@
      "arduino",
      "espidf"
    ],
-    "name": "Espressif ESP32 16M Flash DIO PSRAM, 4608KB Code/OTA, 2MB FS",
+    "name": "Tasmota ESP32 16M Flash DIO PSRAM, 4608KB Code/OTA, 2MB FS",
    "upload": {
      "flash_size": "16MB",
      "maximum_ram_size": 327680,
@@ -1,7 +1,6 @@
 {
    "build": {
      "core": "esp32",
-      "extra_flags": "-DTASMOTA_SDK",
      "f_cpu": "240000000L",
      "f_flash": "40000000L",
      "flash_mode": "dio",
@@ -1,6 +1,6 @@
 {
  "type": "systembackup",
-  "version": "3.8.2",
+  "version": "3.9.0",
  "systembackup": [
    {
      "type": "settings",
@@ -15,7 +15,8 @@
        "enableMDNS": true,
        "enableCORS": false,
        "CORSOrigin": "*",
-        "tx_power": 0
+        "tx_power": 0,
+        "eth_10mbit": false
      },
      "AP": {
        "provision_mode": 1,
@@ -37,7 +38,7 @@
        "base": "ems-esp",
        "username": "",
        "password": "",
-        "client_id": "esp32-b8ffc9ec",
+        "client_id": "ems-esp",
        "keep_alive": 60,
        "clean_session": false,
        "entity_format": 1,
@@ -64,7 +65,10 @@
        "enabled": false,
        "server": "time.google.com",
        "tz_label": "Europe/Amsterdam",
-        "tz_format": "CET-1CEST,M3.5.0,M10.5.0/3"
+        "tz_format": "CET-1CEST,M3.5.0,M10.5.0/3",
+        "thermostat_sync": 1,
+        "tz_label_t": "Europe/Amsterdam",
+        "tz_format_t": "CET-1CEST,M3.5.0,M10.5.0/3"
      },
      "Security": {
        "jwt_secret": "ems-esp-neo",
@@ -82,9 +86,10 @@
        ]
      },
      "Settings": {
-        "version": "3.8.2-dev.22",
+        "version": "3.9.0",
        "board_profile": "E32V2_2",
        "platform": "ESP32",
+        "system_name": "",
        "locale": "en",
        "tx_mode": 5,
        "ems_bus_id": 73,
@@ -131,7 +136,23 @@
        "modbus_port": 502,
        "modbus_max_clients": 10,
        "modbus_timeout": 300,
-        "developer_mode": false
+        "developer_mode": false,
+        "disable_reset": false,
+        "email_enabled": false,
+        "email_security": 2,
+        "email_server": "smtp.example.net",
+        "email_port": 587,
+        "email_login": "",
+        "email_pass": "",
+        "email_sender": "ems-esp@example.net",
+        "email_recp": "",
+        "email_subject": "ems-esp notification"
+      }
+    },
+    {
+      "type": "commands",
+      "Commands": {
+        "commands": []
      }
    },
    {
@@ -143,43 +164,8 @@
    {
      "type": "customizations",
      "Customizations": {
-        "ts": [
-          {
-            "id": "28_1767_7B13_2502",
-            "name": "gateway_temperature",
-            "offset": 0,
-            "is_system": true
-          }
-        ],
-        "as": [
-          {
-            "gpio": 39,
-            "name": "core_voltage",
-            "offset": 0,
-            "factor": 0.003771,
-            "uom": 23,
-            "type": 3,
-            "is_system": true
-          },
-          {
-            "gpio": 36,
-            "name": "supply_voltage",
-            "offset": 0,
-            "factor": 0.017,
-            "uom": 23,
-            "type": 3,
-            "is_system": true
-          },
-          {
-            "gpio": 2,
-            "name": "led",
-            "offset": 0,
-            "factor": 1,
-            "uom": 0,
-            "type": 6,
-            "is_system": true
-          }
-        ],
+        "ts": [],
+        "as": [],
        "masked_entities": []
      }
    },
@@ -194,16 +180,6 @@
      "Modules": {
        "modules": []
      }
-    },
-    {
-      "type": "nvs",
-      "nvs": [
-        {
-          "type": 1,
-          "key": "fresh_firmware",
-          "value": 0
-        }
-      ]
    }
  ]
 }
@@ -13,7 +13,7 @@ telegram_type_id,name,is_fetched
 0x19,UBAMonitorSlow, 
 0x1A,UBASetPoints, 
 0x1C,UBAMaintenanceStatus, 
-0x1E,WM10TempMessage, 
+0x1E,HydrTemp, 
 0x23,JunkersSetMixer,fetched
 0x27,UBASettingsWW,fetched
 0x28,WeatherComp,fetched
@@ -29,7 +29,7 @@ telegram_type_id,name,is_fetched
 0x3B,Energy, 
 0x3D,RC35Set, 
 0x3E,RC35Monitor, 
-0x3F,RC35Timer, 
+0x3F,RC30Timer, 
 0x40,RC30Temp, 
 0x41,RC30Monitor, 
 0x42,RC35Timer2, 
@@ -115,7 +115,7 @@ telegram_type_id,name,is_fetched
 0x02A5,CRFMonitor, 
 0x02A6,RC300Monitor, 
 0x02A7,RC300Monitor, 
-0x02A8,CRFMonitor, 
+0x02A8,RC300Monitor, 
 0x02A9,RC300Monitor, 
 0x02AA,RC300Monitor, 
 0x02AB,RC300Monitor, 
@@ -172,19 +172,20 @@ telegram_type_id,name,is_fetched
 0x0469,HPSet, 
 0x046A,HPSet, 
 0x0470,RC300Summer3,fetched
-0x0471,RC300Sumr2, 
-0x0472,RC300Sumr2, 
-0x0473,RC300Sumr2, 
-0x0474,RC300Sumr2, 
-0x0475,RC300Sumr2, 
-0x0476,RC300Sumr2, 
-0x0477,RC300Sumr2, 
-0x0478,RC300Sumr2, 
+0x0471,RC300Summer2, 
+0x0472,RC300Summer2, 
+0x0473,RC300Summer2, 
+0x0474,RC300Summer2, 
+0x0475,RC300Summer2, 
+0x0476,RC300Summer2, 
+0x0477,RC300Summer2, 
+0x0478,RC300Summer2, 
 0x047B,HP2, 
 0x0484,HPSilentMode,fetched
 0x0485,HpCooling,fetched
 0x0486,HpInConfig,fetched
 0x0488,HPValve,fetched
+0x0489,HPpassive, 
 0x048A,HpPool,fetched
 0x048B,HPPumps,fetched
 0x048D,HpPower,fetched
@@ -208,6 +209,7 @@ telegram_type_id,name,is_fetched
 0x0585,Blowerspeed, 
 0x0587,Bypass, 
 0x05BA,HpPoolStatus,fetched
+0x05C4,HpPoolShunt, 
 0x05D9,Airquality, 
 0x0772,HIUSettings, 
 0x0779,HIUMonitor, 
@@ -231,4 +233,6 @@ telegram_type_id,name,is_fetched
 0x099A,HPStarts, 
 0x099B,HPFlowTemp, 
 0x099C,HPComp, 
+0x099D,HPComp2, 
 0x09A0,HPTemperature, 
+0x09A8,HPVolume, 
@@ -3,7 +3,7 @@ build_flags =
    ; WiFi settings
    -D FACTORY_WIFI_SSID=\"\"
    -D FACTORY_WIFI_PASSWORD=\"\"
-    -D FACTORY_WIFI_HOSTNAME=\"ems-esp\"
+    -D FACTORY_NETWORK_HOSTNAME=\"ems-esp\"

 	; Access point settings
    -D FACTORY_AP_PROVISION_MODE=AP_MODE_DISCONNECTED
@@ -24,7 +24,7 @@ build_flags =
    -D FACTORY_NTP_TIME_ZONE_LABEL=\"Europe/Amsterdam\"
    -D FACTORY_NTP_TIME_ZONE_FORMAT=\"CET-1CEST,M3.5.0,M10.5.0/3\"
    -D FACTORY_NTP_SERVER=\"time.google.com\"
-    -D FACTORY_NTP_THERMOSTAT_SYNC=0
+    -D FACTORY_NTP_THERMOSTAT_SYNC=1

    ; MQTT settings
    -D FACTORY_MQTT_ENABLED=false
@@ -1,9 +1,9 @@
 {
  "name": "EMS-ESP",
-  "version": "3.8.2",
+  "version": "3.9.0",
  "description": "EMS-ESP WebUI",
  "homepage": "https://emsesp.org",
-  "author": "proddy, emsesp.org",
+  "author": "emsesp.org",
  "license": "MIT",
  "private": true,
  "type": "module",
@@ -23,49 +23,40 @@
    "standalone-devcontainer": "concurrently -c \"auto\" \"typesafe-i18n\" \"pnpm:mock-rest\" \"vite --host\""
  },
  "dependencies": {
-    "@alova/adapter-xhr": "2.3.1",
+    "@alova/adapter-xhr": "2.3.3",
    "@emotion/react": "^11.14.0",
    "@emotion/styled": "^11.14.1",
-    "@mui/icons-material": "^9.2.0",
-    "@mui/material": "^9.2.0",
-    "@preact/compat": "^18.3.2",
+    "@mui/icons-material": "^9.4.0",
+    "@mui/material": "^9.4.0",
    "@table-library/react-table-library": "4.1.15",
-    "alova": "3.5.1",
-    "async-validator": "^4.2.5",
-    "etag": "^1.8.1",
-    "formidable": "^3.5.4",
+    "alova": "^3.5.5",
    "jwt-decode": "^4.0.0",
-    "magic-string": "^0.30.21",
-    "mime-types": "^3.0.2",
-    "preact": "^10.29.7",
-    "react": "^19.2.7",
-    "react-dom": "^19.2.7",
+    "preact": "^11.0.0",
+    "react": "^19.3.0",
+    "react-dom": "^19.3.0",
    "react-icons": "^5.7.0",
-    "react-router": "^7.18.1",
-    "react-toastify": "^11.1.0",
-    "typesafe-i18n": "^5.27.1",
-    "typescript": "^6.0.3"
+    "react-router": "^8.4.0",
+    "typesafe-i18n": "^5.27.1"
  },
  "devDependencies": {
-    "@babel/core": "^7.29.7",
    "@eslint/js": "^10.0.1",
-    "@preact/compat": "^18.3.2",
-    "@preact/preset-vite": "^2.10.5",
+    "@preact/preset-vite": "^2.10.6",
    "@trivago/prettier-plugin-sort-imports": "^6.0.2",
-    "@types/node": "^25.7.0",
-    "@types/react": "^19.2.14",
-    "@types/react-dom": "^19.2.3",
-    "axe-core": "^4.12.1",
-    "concurrently": "^9.2.4",
-    "eslint": "^10.7.0",
+    "@types/node": "^26.6.4",
+    "@types/react": "^19.3.0",
+    "@types/react-dom": "^19.3.0",
+    "concurrently": "^10.0.5",
+    "eslint": "^10.12.0",
    "eslint-config-prettier": "^10.1.8",
-    "prettier": "^3.9.5",
-    "rollup-plugin-visualizer": "^7.0.1",
-    "terser": "^5.47.1",
-    "typescript-eslint": "^8.59.3",
-    "vite": "^8.0.12",
-    "vite-plugin-imagemin": "^0.6.1",
-    "vite-tsconfig-paths": "^6.1.1"
+    "etag": "^1.8.1",
+    "mime-types": "^3.0.2",
+    "prettier": "^3.9.9",
+    "rollup-plugin-visualizer": "^7.1.1",
+    "terser": "^5.51.2",
+    "typescript": "^6.0.3",
+    "typescript-eslint": "^8.71.1",
+    "vite": "^8.3.3",
+    "vite-plugin-imagemin": "^0.6.1"
  },
-  "packageManager": "pnpm@10.33.4+sha512.1c67b3b359b2d408119ba1ed289f34b8fc3c6873412bec6fd264fbdc82489e510fcbecb9ce9d22dae7f3b76269d8441046014bdca53b9979cd7a561ad631b800"
+  "packageManager": "pnpm@12.10.1"
 }
@@ -1,33 +1,8 @@
 allowBuilds:
-  cwebp-bin: set this to true or false
-  esbuild: set this to true or false
-  gifsicle: set this to true or false
-  jpegtran-bin: set this to true or false
-  mozjpeg: set this to true or false
-  optipng-bin: set this to true or false
-  pngquant-bin: set this to true or false
-minimumReleaseAgeExclude:
-  - '@babel/code-frame@7.29.7'
-  - '@babel/compat-data@7.29.7'
-  - '@babel/core@7.29.7'
-  - '@babel/generator@7.29.7'
-  - '@babel/helper-compilation-targets@7.29.7'
-  - '@babel/helper-globals@7.29.7'
-  - '@babel/helper-module-imports@7.29.7'
-  - '@babel/helper-module-transforms@7.29.7'
-  - '@babel/helper-string-parser@7.29.7'
-  - '@babel/helper-validator-identifier@7.29.7'
-  - '@babel/helper-validator-option@7.29.7'
-  - '@babel/helpers@7.29.7'
-  - '@babel/parser@7.29.7'
-  - '@babel/template@7.29.7'
-  - '@babel/traverse@7.29.7'
-  - '@babel/types@7.29.7'
-onlyBuiltDependencies:
-  - cwebp-bin
-  - esbuild
-  - gifsicle
-  - jpegtran-bin
-  - mozjpeg
-  - optipng-bin
-  - pngquant-bin
+  cwebp-bin: false
+  esbuild: false
+  gifsicle: false
+  jpegtran-bin: false
+  mozjpeg: false
+  optipng-bin: false
+  pngquant-bin: false
@@ -46,6 +46,38 @@ ${fileInfo.map((f) => `${INDENT}{"${f.uri}", "${f.mimeType}", ${f.variable}, ${f
 static constexpr size_t WWW_ASSETS_COUNT = sizeof(WWW_ASSETS) / sizeof(WWW_ASSETS[0]);
 `;

+// Optional locale allow-list, shared with the Vite build via VITE_APP_LOCALES
+// (e.g. "en,de,nl"). When set, locale chunks outside the list are NOT embedded
+// into firmware flash. `en` is always kept as the fallback. Unset => embed all.
+const ALL_LOCALES = [
+  'cs',
+  'de',
+  'en',
+  'fr',
+  'it',
+  'nl',
+  'no',
+  'pl',
+  'sk',
+  'sv',
+  'tr'
+];
+const localeAllowList = (process.env.VITE_APP_LOCALES || '')
+  .split(',')
+  .map((locale) => locale.trim())
+  .filter(Boolean);
+
+const isExcludedLocaleChunk = (relativeFilePath) => {
+  if (localeAllowList.length === 0) return false;
+  const base = relativeFilePath.split(sep).pop();
+  const match = /^([a-z]{2})-[A-Za-z0-9_-]+\.js$/.exec(base);
+  if (!match) return false;
+  const code = match[1];
+  // Only treat known locale codes as locale chunks; never drop the en fallback.
+  if (!ALL_LOCALES.includes(code) || code === 'en') return false;
+  return !localeAllowList.includes(code);
+};
+
 const getFilesSync = (dir, files = []) => {
  readdirSync(dir, { withFileTypes: true }).forEach((entry) => {
    const entryPath = resolve(dir, entry.name);
@@ -116,7 +148,12 @@ writeStream.write(ARDUINO_INCLUDES);

 const buildPath = resolve(sourcePath);
 for (const filePath of getFilesSync(buildPath)) {
-  writeFile(relative(buildPath, filePath), readFileSync(filePath));
+  const relativeFilePath = relative(buildPath, filePath);
+  if (isExcludedLocaleChunk(relativeFilePath)) {
+    console.log(`Skipping locale (not in VITE_APP_LOCALES): ${relativeFilePath}`);
+    continue;
+  }
+  writeFile(relativeFilePath, readFileSync(filePath));
 }

 writeStream.write(generateWWWClass());
@@ -1,14 +1,15 @@
-import { memo, useCallback, useEffect, useState } from 'react';
-import { ToastContainer, Zoom } from 'react-toastify';
+import { memo, useEffect, useState } from 'react';
+import { Outlet } from 'react-router';

-import AppRouting from 'AppRouting';
 import CustomTheme from 'CustomTheme';
+import { Toaster } from 'components/toast';
+import { Authentication } from 'contexts/authentication';
 import TypesafeI18n from 'i18n/i18n-react';
 import type { Locales } from 'i18n/i18n-types';
 import { loadLocaleAsync } from 'i18n/i18n-util.async';
 import { detectLocale, navigatorDetector } from 'typesafe-i18n/detectors';

-const AVAILABLE_LOCALES = [
+const ALL_LOCALES = [
  'de',
  'en',
  'it',
@@ -22,51 +23,50 @@ const AVAILABLE_LOCALES = [
  'cs'
 ] as Locales[];

-// Static toast configuration - no need to recreate on every render
-const TOAST_CONTAINER_PROPS = {
-  position: 'bottom-left' as const,
-  autoClose: 3000,
-  hideProgressBar: false,
-  newestOnTop: false,
-  closeOnClick: true,
-  rtl: false,
-  pauseOnFocusLoss: true,
-  draggable: false,
-  pauseOnHover: false,
-  transition: Zoom,
-  closeButton: false,
-  theme: 'dark' as const,
-  toastStyle: {
-    border: '1px solid #177ac9',
-    width: 'fit-content'
-  }
-};
+// Optional build-time allow-list (e.g. VITE_APP_LOCALES="en,de,nl"). When unset,
+// every locale is available. `en` is always kept as the fallback locale, and the
+// progmem generator embeds the matching subset into firmware flash.
+const localeAllowList = (import.meta.env.VITE_APP_LOCALES ?? '')
+  .split(',')
+  .map((locale) => locale.trim())
+  .filter(Boolean);
+
+const AVAILABLE_LOCALES: Locales[] = localeAllowList.length
+  ? ALL_LOCALES.filter(
+      (locale) => locale === 'en' || localeAllowList.includes(locale)
+    )
+  : ALL_LOCALES;

 const App = memo(() => {
  const [wasLoaded, setWasLoaded] = useState(false);
  const [locale, setLocale] = useState<Locales>('en');

-  // Memoize locale initialization to prevent unnecessary re-runs
-  const initializeLocale = useCallback(async () => {
-    const browserLocale = detectLocale('en', AVAILABLE_LOCALES, navigatorDetector);
-    const newLocale = (localStorage.getItem('lang') || browserLocale) as Locales;
-    localStorage.setItem('lang', newLocale);
-    setLocale(newLocale);
-    await loadLocaleAsync(newLocale);
-    setWasLoaded(true);
-  }, []);
-
  useEffect(() => {
+    const initializeLocale = async () => {
+      const browserLocale = detectLocale('en', AVAILABLE_LOCALES, navigatorDetector);
+      const stored = localStorage.getItem('lang');
+      // Ignore a stored locale that isn't available (e.g. trimmed from this build).
+      const newLocale =
+        stored && AVAILABLE_LOCALES.includes(stored as Locales)
+          ? (stored as Locales)
+          : browserLocale;
+      localStorage.setItem('lang', newLocale);
+      setLocale(newLocale);
+      await loadLocaleAsync(newLocale);
+      setWasLoaded(true);
+    };
    void initializeLocale();
-  }, [initializeLocale]);
+  }, []);

  if (!wasLoaded) return null;

  return (
    <TypesafeI18n locale={locale}>
      <CustomTheme>
-        <AppRouting />
-        <ToastContainer {...TOAST_CONTAINER_PROPS} />
+        <Authentication>
+          <Outlet />
+        </Authentication>
+        <Toaster />
      </CustomTheme>
    </TypesafeI18n>
  );
@@ -1,72 +0,0 @@
-import { type FC, memo, useContext, useEffect, useRef } from 'react';
-import { Navigate, Route, Routes } from 'react-router';
-import { toast } from 'react-toastify';
-
-import AuthenticatedRouting from 'AuthenticatedRouting';
-import SignIn from 'SignIn';
-import { RequireAuthenticated, RequireUnauthenticated } from 'components';
-import { Authentication, AuthenticationContext } from 'contexts/authentication';
-import { useI18nContext } from 'i18n/i18n-react';
-
-interface SecurityRedirectProps {
-  readonly message: string;
-  readonly signOut?: boolean;
-}
-
-const RootRedirect: FC<SecurityRedirectProps> = memo(
-  ({ message, signOut = false }) => {
-    const { signOut: contextSignOut } = useContext(AuthenticationContext);
-    const hasShownToast = useRef(false);
-
-    useEffect(() => {
-      // Prevent duplicate toasts on strict mode or re-renders
-      if (!hasShownToast.current) {
-        hasShownToast.current = true;
-        if (signOut) {
-          contextSignOut(false);
-        }
-        toast.success(message);
-      }
-      // Only run once on mount - using ref to track execution
-    }, []);
-
-    return <Navigate to="/" replace />;
-  }
-);
-
-const AppRouting: FC = memo(() => {
-  const { LL } = useI18nContext();
-
-  return (
-    <Authentication>
-      <Routes>
-        <Route
-          path="/unauthorized"
-          element={<RootRedirect message={LL.PLEASE_SIGNIN()} signOut />}
-        />
-        <Route
-          path="/fileUpdated"
-          element={<RootRedirect message={LL.UPLOAD_SUCCESSFUL()} />}
-        />
-        <Route
-          path="/"
-          element={
-            <RequireUnauthenticated>
-              <SignIn />
-            </RequireUnauthenticated>
-          }
-        />
-        <Route
-          path="/*"
-          element={
-            <RequireAuthenticated>
-              <AuthenticatedRouting />
-            </RequireAuthenticated>
-          }
-        />
-      </Routes>
-    </Authentication>
-  );
-});
-
-export default AppRouting;
@@ -1,79 +0,0 @@
-import { memo, useContext } from 'react';
-import { Navigate, Route, Routes } from 'react-router';
-
-import CustomEntities from 'app/main/CustomEntities';
-import Customizations from 'app/main/Customizations';
-import Dashboard from 'app/main/Dashboard';
-import Devices from 'app/main/Devices';
-import Help from 'app/main/Help';
-import Modules from 'app/main/Modules';
-import Scheduler from 'app/main/Scheduler';
-import Sensors from 'app/main/Sensors';
-import UserProfile from 'app/main/UserProfile';
-import APSettings from 'app/settings/APSettings';
-import ApplicationSettings from 'app/settings/ApplicationSettings';
-import DownloadUpload from 'app/settings/DownloadUpload';
-import MqttSettings from 'app/settings/MqttSettings';
-import NTPSettings from 'app/settings/NTPSettings';
-import Settings from 'app/settings/Settings';
-import Network from 'app/settings/network/Network';
-import Security from 'app/settings/security/Security';
-import APStatus from 'app/status/APStatus';
-import Activity from 'app/status/Activity';
-import HardwareStatus from 'app/status/HardwareStatus';
-import MqttStatus from 'app/status/MqttStatus';
-import NTPStatus from 'app/status/NTPStatus';
-import NetworkStatus from 'app/status/NetworkStatus';
-import Status from 'app/status/Status';
-import SystemLog from 'app/status/SystemLog';
-import Version from 'app/status/Version';
-import { Layout } from 'components';
-import { AuthenticatedContext } from 'contexts/authentication';
-
-const AuthenticatedRouting = memo(() => {
-  const { me } = useContext(AuthenticatedContext);
-  return (
-    <Layout>
-      <Routes>
-        <Route path="/dashboard/*" element={<Dashboard />} />
-        <Route path="/devices/*" element={<Devices />} />
-        <Route path="/sensors/*" element={<Sensors />} />
-        <Route path="/help/*" element={<Help />} />
-        <Route path="/user/*" element={<UserProfile />} />
-
-        <Route path="/status/*" element={<Status />} />
-        <Route path="/status/hardwarestatus/*" element={<HardwareStatus />} />
-        <Route path="/status/activity" element={<Activity />} />
-        <Route path="/status/log" element={<SystemLog />} />
-        <Route path="/status/mqtt" element={<MqttStatus />} />
-        <Route path="/status/ntp" element={<NTPStatus />} />
-        <Route path="/status/ap" element={<APStatus />} />
-        <Route path="/status/network" element={<NetworkStatus />} />
-        <Route path="/status/version" element={<Version />} />
-
-        {me.admin && (
-          <>
-            <Route path="/settings" element={<Settings />} />
-            <Route path="/settings/application" element={<ApplicationSettings />} />
-            <Route path="/settings/mqtt" element={<MqttSettings />} />
-            <Route path="/settings/ntp" element={<NTPSettings />} />
-            <Route path="/settings/ap" element={<APSettings />} />
-            <Route path="/settings/modules" element={<Modules />} />
-            <Route path="/settings/downloadUpload" element={<DownloadUpload />} />
-
-            <Route path="/settings/network/*" element={<Network />} />
-            <Route path="/settings/security/*" element={<Security />} />
-
-            <Route path="/customizations" element={<Customizations />} />
-            <Route path="/scheduler" element={<Scheduler />} />
-            <Route path="/customentities" element={<CustomEntities />} />
-          </>
-        )}
-
-        <Route path="/*" element={<Navigate to="/" />} />
-      </Routes>
-    </Layout>
-  );
-});
-
-export default AuthenticatedRouting;
@@ -1,5 +1,4 @@
-import { memo, useCallback, useContext, useEffect, useMemo, useState } from 'react';
-import { toast } from 'react-toastify';
+import { memo, useContext, useEffect, useState } from 'react';

 import ForwardIcon from '@mui/icons-material/Forward';
 import { Box, Button, Paper, Typography } from '@mui/material';
@@ -7,18 +6,19 @@ import type { Theme } from '@mui/material/styles';

 import * as AuthenticationApi from 'components/routing/authentication';
 import { useRequest } from 'alova/client';
-import type { ValidateFieldsError } from 'async-validator';
 import {
  LanguageSelector,
  ValidatedPasswordField,
  ValidatedTextField
 } from 'components';
+import { toast } from 'components/toast';
 import { AuthenticationContext } from 'contexts/authentication';
 import { PROJECT_NAME } from 'env';
 import { useI18nContext } from 'i18n/i18n-react';
 import type { SignInRequest } from 'types';
 import { onEnterCallback, updateValue } from 'utils';
 import { SIGN_IN_REQUEST_VALIDATOR, ValidationError, validate } from 'validators';
+import type { ValidateFieldsError } from 'validators/schema';

 const SignIn = memo(() => {
  const authenticationContext = useContext(AuthenticationContext);
@@ -43,18 +43,13 @@ const SignIn = memo(() => {
    }
  });

-  // Memoize callback to prevent recreation on every render
-  const updateLoginRequestValue = useMemo(
-    () =>
-      updateValue((updater) =>
-        setSignInRequest(
-          updater as unknown as (prevState: SignInRequest) => SignInRequest
-        )
-      ),
-    []
+  const updateLoginRequestValue = updateValue((updater) =>
+    setSignInRequest(
+      updater as unknown as (prevState: SignInRequest) => SignInRequest
+    )
  );

-  const signIn = useCallback(async () => {
+  const signIn = async () => {
    await callSignIn(signInRequest).catch((event: Error) => {
      if (event.message === 'Unauthorized') {
        toast.warning(LL.INVALID_LOGIN());
@@ -63,9 +58,9 @@ const SignIn = memo(() => {
      }
      setProcessing(false);
    });
-  }, [callSignIn, signInRequest, LL]);
+  };

-  const validateAndSignIn = useCallback(async () => {
+  const validateAndSignIn = async () => {
    setProcessing(true);
    SIGN_IN_REQUEST_VALIDATOR.messages({
      required: LL.IS_REQUIRED('%s')
@@ -77,9 +72,9 @@ const SignIn = memo(() => {
      setFieldErrors((error as ValidationError).fieldErrors);
      setProcessing(false);
    }
-  }, [signInRequest, signIn, LL]);
+  };

-  const submitOnEnter = useMemo(() => onEnterCallback(signIn), [signIn]);
+  const submitOnEnter = onEnterCallback(signIn);

  // get rid of scrollbar
  useEffect(() => {
@@ -4,6 +4,8 @@ import type {
  APIcall,
  Action,
  Activity,
+  CommandItem,
+  Commands,
  CoreData,
  DashboardData,
  DeviceData,
@@ -102,8 +104,7 @@ export const readSchedule = () =>
        o_deleted: si.deleted,
        o_flags: si.flags,
        o_time: si.time,
-        o_cmd: si.cmd,
-        o_value: si.value,
+        o_cmd_name: si.cmd_name,
        o_name: si.name
      }));
    }
@@ -111,6 +112,23 @@ export const readSchedule = () =>
 export const writeSchedule = (data: Schedule) =>
  alovaInstance.Post('/rest/schedule', data);

+// Commands
+export const readCommands = () =>
+  alovaInstance.Get<CommandItem[]>('/rest/commands', {
+    transform(data) {
+      const commands = (data as Commands).commands;
+      return commands.map((ci) => ({
+        ...ci,
+        o_id: ci.id,
+        o_cmd: ci.cmd,
+        o_value: ci.value,
+        o_name: ci.name
+      }));
+    }
+  });
+export const writeCommands = (data: Commands) =>
+  alovaInstance.Post('/rest/commands', data);
+
 // Modules
 export const readModules = () =>
  alovaInstance.Get<ModuleItem[]>('/rest/modules', {
@@ -57,12 +57,3 @@ export const alovaInstance = createAlova({
    onSuccess: handleResponse
  }
 });
-
-export const alovaInstanceGH = createAlova({
-  baseURL:
-    process.env.NODE_ENV === 'development'
-      ? '/gh'
-      : 'https://api.github.com/repos/emsesp/EMS-ESP32/releases',
-  statesHook: ReactHook,
-  requestAdapter: xhrRequestAdapter()
-});
@@ -1,8 +1,8 @@
 import type { LogSettings, SystemStatus } from 'types';

-import { alovaInstance, alovaInstanceGH } from './endpoints';
+import { alovaInstance } from './endpoints';

-// systemStatus - also used to ping in System Monitor for pinging
+// systemStatus - also used in System Monitor to ping the ESP
 export const readSystemStatus = () =>
  alovaInstance.Get<SystemStatus>('/rest/systemStatus');

@@ -13,29 +13,6 @@ export const updateLogSettings = (data: LogSettings) =>
  alovaInstance.Post('/rest/logSettings', data);
 export const fetchLogES = () => alovaInstance.Get('/es/log');

-// Get versions from GitHub
-// cache for 10 minutes to stop getting the IP blocked by GitHub
-export const getStableVersion = () =>
-  alovaInstanceGH.Get('latest', {
-    cacheFor: 60 * 10 * 1000,
-    transform(response: { data: { name: string; published_at: string } }) {
-      return {
-        name: response.data.name.substring(1),
-        published_at: response.data.published_at
-      };
-    }
-  });
-export const getDevVersion = () =>
-  alovaInstanceGH.Get('tags/latest', {
-    cacheFor: 60 * 10 * 1000,
-    transform(response: { data: { name: string; published_at: string } }) {
-      return {
-        name: response.data.name.split(/\s+/).splice(-1)[0]?.substring(1) || '',
-        published_at: response.data.published_at
-      };
-    }
-  });
-
 const UPLOAD_TIMEOUT = 60000; // 1 minute

 export const uploadFile = (file: File) => {
@@ -0,0 +1,284 @@
+import { useState } from 'react';
+import { useBlocker } from 'react-router';
+
+import AddIcon from '@mui/icons-material/Add';
+import CancelIcon from '@mui/icons-material/Cancel';
+import WarningIcon from '@mui/icons-material/Warning';
+import { Box, Button, Typography } from '@mui/material';
+
+import {
+  Body,
+  Cell,
+  Header,
+  HeaderCell,
+  HeaderRow,
+  Row,
+  Table
+} from '@table-library/react-table-library/table';
+import { useTheme } from '@table-library/react-table-library/theme';
+import { updateState, useRequest } from 'alova/client';
+import {
+  BlockNavigation,
+  ButtonRow,
+  FormLoader,
+  SectionContent,
+  useLayoutTitle
+} from 'components';
+import { toast } from 'components/toast';
+import { useI18nContext } from 'i18n/i18n-react';
+import { useInterval } from 'utils';
+
+import { readCommands, writeCommands } from '../../api/app';
+import CommandsDialog from './CommandsDialog';
+import type { CommandItem, Commands as CommandsType } from './types';
+import { commandItemValidation } from './validators';
+
+const INTERVAL_DELAY = 30000;
+const MIN_ID = -100;
+const MAX_ID = 100;
+
+const DEFAULT_COMMAND_ITEM: Omit<CommandItem, 'id'> = {
+  cmd: '',
+  value: '',
+  name: '',
+  deleted: false
+};
+
+const commandsTheme = {
+  Table: `
+    --data-table-library_grid-template-columns: repeat(1, minmax(100px, 1fr)) repeat(1, minmax(100px, 1fr)) 160px;
+  `,
+  BaseRow: `
+    font-size: 14px;
+    .td {
+      height: 32px;
+    }
+  `,
+  BaseCell: `
+  &:nth-of-type(1) {
+    padding: 8px;
+  }
+  `,
+  HeaderRow: `
+    text-transform: uppercase;
+    background-color: black;
+    color: #90CAF9;
+    .th {
+      border-bottom: 1px solid #565656;
+      height: 36px;
+    }
+  `,
+  Row: `
+    background-color: #1e1e1e;
+    position: relative;
+    cursor: pointer;
+    .td {
+      border-bottom: 1px solid #565656;
+    }
+    &:hover .td {
+      background-color: #177ac9;
+    }
+  `
+};
+
+const Commands = () => {
+  const { LL } = useI18nContext();
+  const [numChanges, setNumChanges] = useState<number>(0);
+  const blocker = useBlocker(numChanges !== 0);
+  const [selectedItem, setSelectedItem] = useState<CommandItem>();
+  const [creating, setCreating] = useState<boolean>(false);
+  const [dialogOpen, setDialogOpen] = useState<boolean>(false);
+
+  useLayoutTitle(LL.COMMANDS());
+
+  const {
+    data: commands,
+    send: fetchCommands,
+    error
+  } = useRequest(readCommands, {
+    initialData: []
+  });
+
+  const { send: updateCommands } = useRequest(
+    (data: CommandsType) => writeCommands(data),
+    { immediate: false }
+  );
+
+  const hasChanged = (ci: CommandItem) =>
+    ci.id !== ci.o_id ||
+    (ci.name || '') !== (ci.o_name || '') ||
+    ci.cmd !== ci.o_cmd ||
+    ci.value !== ci.o_value ||
+    ci.deleted !== ci.o_deleted;
+
+  useInterval(() => {
+    if (numChanges === 0) {
+      void fetchCommands();
+    }
+  }, INTERVAL_DELAY);
+
+  const theme = useTheme(commandsTheme);
+
+  const saveCommands = async () => {
+    try {
+      await updateCommands({
+        commands: commands
+          .filter((ci: CommandItem) => !ci.deleted)
+          .map((ci: CommandItem) => ({
+            id: ci.id,
+            cmd: ci.cmd,
+            value: ci.value,
+            name: ci.name
+          }))
+      });
+      toast.success(LL.UPDATED_OF(LL.COMMANDS()));
+    } catch (error: unknown) {
+      const message = error instanceof Error ? error.message : String(error);
+      toast.error(message);
+    } finally {
+      await fetchCommands();
+      setNumChanges(0);
+    }
+  };
+
+  const editItem = (ci: CommandItem) => {
+    setCreating(false);
+    setSelectedItem(ci);
+    setDialogOpen(true);
+    if (ci.o_name === undefined) {
+      ci.o_name = ci.name;
+    }
+  };
+
+  const onDialogClose = () => {
+    setDialogOpen(false);
+  };
+
+  const onDialogCancel = async () => {
+    await fetchCommands().then(() => {
+      setNumChanges(0);
+    });
+  };
+
+  const onDialogSave = (updatedItem: CommandItem) => {
+    setDialogOpen(false);
+    void updateState(readCommands(), (data: CommandItem[]) => {
+      const new_data = creating
+        ? [...data, updatedItem]
+        : data.map((ci) =>
+            ci.id === updatedItem.id ? { ...ci, ...updatedItem } : ci
+          );
+      setNumChanges(new_data.filter((ci) => hasChanged(ci)).length);
+      return new_data;
+    });
+  };
+
+  const addItem = () => {
+    setCreating(true);
+    const newItem: CommandItem = {
+      id: Math.floor(Math.random() * (MAX_ID - MIN_ID) + MIN_ID),
+      ...DEFAULT_COMMAND_ITEM
+    };
+    setSelectedItem(newItem);
+    setDialogOpen(true);
+  };
+
+  const filteredCommands = commands.filter((ci: CommandItem) => !ci.deleted);
+
+  const renderCommands = () => {
+    if (!commands) {
+      return (
+        <FormLoader onRetry={fetchCommands} errorMessage={error?.message || ''} />
+      );
+    }
+
+    return (
+      <Table
+        data={{ nodes: filteredCommands }}
+        theme={theme}
+        layout={{ custom: true }}
+      >
+        {(tableList: CommandItem[]) => (
+          <>
+            <Header>
+              <HeaderRow>
+                <HeaderCell stiff>{LL.COMMAND(0)}</HeaderCell>
+                <HeaderCell stiff>{LL.VALUE(0)}</HeaderCell>
+                <HeaderCell stiff>{LL.NAME(0)}</HeaderCell>
+              </HeaderRow>
+            </Header>
+            <Body>
+              {tableList.map((ci: CommandItem) => (
+                <Row key={ci.id} item={ci} onClick={() => editItem(ci)}>
+                  <Cell>{ci.cmd}</Cell>
+                  <Cell>{ci.value}</Cell>
+                  <Cell>{ci.name}</Cell>
+                </Row>
+              ))}
+            </Body>
+          </>
+        )}
+      </Table>
+    );
+  };
+
+  return (
+    <SectionContent>
+      {blocker ? <BlockNavigation blocker={blocker} /> : null}
+      <Typography sx={{ mb: 2 }} color="warning" variant="body1">
+        {LL.COMMANDS_HELP_1()}.
+      </Typography>
+      {renderCommands()}
+
+      {selectedItem && (
+        <CommandsDialog
+          open={dialogOpen}
+          creating={creating}
+          onClose={onDialogClose}
+          onSave={onDialogSave}
+          selectedItem={selectedItem}
+          validator={commandItemValidation(commands, selectedItem)}
+        />
+      )}
+
+      <Box sx={{ display: 'flex', flexWrap: 'wrap' }}>
+        <Box sx={{ flexGrow: 1 }}>
+          {numChanges !== 0 && (
+            <ButtonRow>
+              <Button
+                startIcon={<CancelIcon />}
+                variant="outlined"
+                onClick={onDialogCancel}
+                color="secondary"
+              >
+                {LL.CANCEL()}
+              </Button>
+              <Button
+                startIcon={<WarningIcon color="warning" />}
+                variant="contained"
+                color="info"
+                onClick={saveCommands}
+              >
+                {LL.APPLY_CHANGES(numChanges)}
+              </Button>
+            </ButtonRow>
+          )}
+        </Box>
+        <Box sx={{ flexWrap: 'nowrap', whiteSpace: 'nowrap' }}>
+          <ButtonRow>
+            <Button
+              startIcon={<AddIcon />}
+              variant="outlined"
+              color="primary"
+              onClick={addItem}
+            >
+              {LL.ADD(0)}
+            </Button>
+          </ButtonRow>
+        </Box>
+      </Box>
+    </SectionContent>
+  );
+};
+
+export default Commands;
@@ -0,0 +1,206 @@
+import { useEffect, useState } from 'react';
+
+import AddIcon from '@mui/icons-material/Add';
+import CancelIcon from '@mui/icons-material/Cancel';
+import DoneIcon from '@mui/icons-material/Done';
+import PlayArrowIcon from '@mui/icons-material/PlayArrow';
+import RemoveIcon from '@mui/icons-material/RemoveCircleOutlined';
+import {
+  Box,
+  Button,
+  Dialog,
+  DialogActions,
+  DialogContent,
+  DialogTitle,
+  TextField
+} from '@mui/material';
+
+import { callAction } from '@/api/app';
+import { dialogStyle } from 'CustomTheme';
+import { useRequest } from 'alova/client';
+import { ValidatedTextField } from 'components';
+import { toast } from 'components/toast';
+import { useI18nContext } from 'i18n/i18n-react';
+import { updateValue } from 'utils';
+import { ValidationError, validate } from 'validators';
+import type Schema from 'validators/schema';
+import type { ValidateFieldsError } from 'validators/schema';
+
+import type { CommandItem } from './types';
+
+interface CommandsDialogProps {
+  open: boolean;
+  creating: boolean;
+  onClose: () => void;
+  onSave: (ci: CommandItem) => void;
+  selectedItem: CommandItem;
+  validator: Schema;
+}
+
+const CommandsDialog = ({
+  open,
+  creating,
+  onClose,
+  onSave,
+  selectedItem,
+  validator
+}: CommandsDialogProps) => {
+  const { LL } = useI18nContext();
+  const [hasChanges, setHasChanges] = useState<boolean>(false);
+  const [editItem, setEditItem] = useState<CommandItem>(selectedItem);
+  const [fieldErrors, setFieldErrors] = useState<ValidateFieldsError>();
+
+  const updateFormValue = updateValue(
+    setEditItem as unknown as React.Dispatch<
+      React.SetStateAction<Record<string, unknown>>
+    >
+  );
+
+  useEffect(() => {
+    if (open) {
+      setFieldErrors(undefined);
+      setEditItem(selectedItem);
+    }
+  }, [open, selectedItem]);
+
+  const hasChanged = (ci: CommandItem) =>
+    ci.id !== ci.o_id ||
+    (ci.name || '') !== (ci.o_name || '') ||
+    ci.cmd !== ci.o_cmd ||
+    ci.value !== ci.o_value ||
+    ci.deleted !== ci.o_deleted;
+
+  useEffect(() => {
+    setHasChanges(hasChanged(editItem));
+  }, [editItem]);
+
+  const handleSave = async (itemToSave: CommandItem) => {
+    try {
+      setFieldErrors(undefined);
+      await validate(validator, itemToSave);
+      onSave(itemToSave);
+    } catch (error) {
+      setFieldErrors((error as ValidationError).fieldErrors);
+    } finally {
+      // setHasChanges(false);
+    }
+  };
+
+  const save = async () => {
+    await handleSave(editItem);
+  };
+
+  const { send: executeCommand } = useRequest(
+    (id: string) => callAction({ action: 'executeCommand', param: id }),
+    { immediate: false }
+  )
+    .onSuccess(() => {
+      toast.success(LL.COMMAND_EXECUTED());
+    })
+    .onError((error) => {
+      toast.error(String(error.error?.message || 'An error occurred'));
+    });
+
+  const execute = async () => {
+    await executeCommand(editItem.name);
+  };
+
+  const remove = () => {
+    onSave({ ...editItem, deleted: true });
+  };
+
+  const handleClose = (
+    _event: React.SyntheticEvent,
+    reason: 'backdropClick' | 'escapeKeyDown'
+  ) => {
+    if (reason !== 'backdropClick') {
+      onClose();
+    }
+  };
+
+  return (
+    <Dialog sx={dialogStyle} open={open} onClose={handleClose}>
+      <DialogTitle>
+        {creating ? `${LL.ADD(1)} ` : LL.UPDATE() + '/' + LL.RUN()}&nbsp;
+        {LL.COMMAND(0)}
+      </DialogTitle>
+      <DialogContent dividers>
+        <ValidatedTextField
+          fieldErrors={fieldErrors || {}}
+          name="cmd"
+          label={LL.COMMAND(0)}
+          multiline
+          fullWidth
+          value={editItem.cmd}
+          margin="normal"
+          onChange={updateFormValue}
+        />
+        <TextField
+          name="value"
+          label={LL.VALUE(0)}
+          multiline
+          margin="normal"
+          fullWidth
+          value={editItem.value}
+          onChange={updateFormValue}
+        />
+        <ValidatedTextField
+          fieldErrors={fieldErrors || {}}
+          name="name"
+          label={LL.NAME(0)}
+          value={editItem.name}
+          fullWidth
+          margin="normal"
+          onChange={updateFormValue}
+        />
+      </DialogContent>
+
+      <DialogActions>
+        {!creating && (
+          <Box sx={{ flexGrow: 1 }}>
+            <Button
+              startIcon={<RemoveIcon />}
+              variant="outlined"
+              color="warning"
+              onClick={remove}
+            >
+              {LL.REMOVE()}
+            </Button>
+          </Box>
+        )}
+        <Button
+          startIcon={<CancelIcon />}
+          variant="outlined"
+          onClick={onClose}
+          color="secondary"
+        >
+          {LL.CANCEL()}
+        </Button>
+
+        {hasChanges && (
+          <Button
+            startIcon={creating ? <AddIcon /> : <DoneIcon />}
+            variant="outlined"
+            onClick={save}
+            color="primary"
+          >
+            {creating ? LL.ADD(0) : LL.UPDATE()}
+          </Button>
+        )}
+
+        {!creating && !hasChanges && editItem.cmd !== '' && (
+          <Button
+            startIcon={<PlayArrowIcon />}
+            variant="outlined"
+            onClick={execute}
+            color="success"
+          >
+            {LL.RUN()}
+          </Button>
+        )}
+      </DialogActions>
+    </Dialog>
+  );
+};
+
+export default CommandsDialog;
@@ -1,6 +1,5 @@
-import { useCallback, useMemo, useState } from 'react';
+import { useState } from 'react';
 import { useBlocker } from 'react-router';
-import { toast } from 'react-toastify';

 import AddIcon from '@mui/icons-material/Add';
 import CancelIcon from '@mui/icons-material/Cancel';
@@ -26,6 +25,7 @@ import {
  SectionContent,
  useLayoutTitle
 } from 'components';
+import { toast } from 'components/toast';
 import { useI18nContext } from 'i18n/i18n-react';
 import { useInterval } from 'utils';

@@ -57,20 +57,18 @@ const CustomEntities = () => {
    initialData: []
  });

-  const intervalCallback = useCallback(() => {
+  useInterval(() => {
    if (!dialogOpen && !numChanges) {
      void fetchEntities();
    }
-  }, [dialogOpen, numChanges, fetchEntities]);
-
-  useInterval(intervalCallback);
+  });

  const { send: writeEntities } = useRequest(
    (data: Entities) => writeCustomEntities(data),
    { immediate: false }
  );

-  const hasEntityChanged = useCallback((ei: EntityItem) => {
+  const hasEntityChanged = (ei: EntityItem) => {
    return (
      ei.id !== ei.o_id ||
      ei.ram !== ei.o_ram ||
@@ -86,21 +84,19 @@ const CustomEntities = () => {
      ei.deleted !== ei.o_deleted ||
      (ei.value || '') !== (ei.o_value || '')
    );
-  }, []);
+  };

-  const entity_theme = useMemo(
-    () =>
-      useTheme({
-        Table: `
+  const entity_theme = useTheme({
+    Table: `
      --data-table-library_grid-template-columns: repeat(1, minmax(60px, 1fr)) minmax(80px, auto) 80px 80px 80px 120px;
    `,
-        BaseRow: `
+    BaseRow: `
      font-size: 14px;
      .td {
        height: 32px;
      }
    `,
-        BaseCell: `
+    BaseCell: `
      &:nth-of-type(1) {
        padding: 8px;
      }
@@ -120,7 +116,7 @@ const CustomEntities = () => {
        text-align: center;
      }
    `,
-        HeaderRow: `
+    HeaderRow: `
      text-transform: uppercase;
      background-color: black;
      color: #90CAF9;
@@ -129,7 +125,7 @@ const CustomEntities = () => {
        height: 36px;
      }
    `,
-        Row: `
+    Row: `
      background-color: #1e1e1e;
      position: relative;
      cursor: pointer;
@@ -140,11 +136,9 @@ const CustomEntities = () => {
        background-color: #177ac9;
      }
    `
-      }),
-    []
-  );
+  });

-  const saveEntities = useCallback(async () => {
+  const saveEntities = async () => {
    await writeEntities({
      entities: entities
        .filter((ei: EntityItem) => !ei.deleted)
@@ -173,44 +167,41 @@ const CustomEntities = () => {
        await fetchEntities();
        setNumChanges(0);
      });
-  }, [entities, writeEntities, LL, fetchEntities]);
+  };

-  const editEntityItem = useCallback((ei: EntityItem) => {
+  const editEntityItem = (ei: EntityItem) => {
    setCreating(false);
    setSelectedEntityItem(ei);
    setDialogOpen(true);
-  }, []);
+  };

-  const onDialogClose = useCallback(() => {
+  const onDialogClose = () => {
    setDialogOpen(false);
-  }, []);
+  };

-  const onDialogCancel = useCallback(async () => {
+  const onDialogCancel = async () => {
    await fetchEntities().then(() => {
      setNumChanges(0);
    });
-  }, [fetchEntities]);
+  };

-  const onDialogSave = useCallback(
-    (updatedItem: EntityItem) => {
-      setDialogOpen(false);
-      void updateState(readCustomEntities(), (data: EntityItem[]) => {
-        const new_data = creating
-          ? [
-              ...data.filter((ei) => creating || ei.o_id !== updatedItem.o_id),
-              updatedItem
-            ]
-          : data.map((ei) =>
-              ei.id === updatedItem.id ? { ...ei, ...updatedItem } : ei
-            );
-        setNumChanges(new_data.filter((ei) => hasEntityChanged(ei)).length);
-        return new_data;
-      });
-    },
-    [creating, hasEntityChanged]
-  );
+  const onDialogSave = (updatedItem: EntityItem) => {
+    setDialogOpen(false);
+    void updateState(readCustomEntities(), (data: EntityItem[]) => {
+      const new_data = creating
+        ? [
+            ...data.filter((ei) => creating || ei.o_id !== updatedItem.o_id),
+            updatedItem
+          ]
+        : data.map((ei) =>
+            ei.id === updatedItem.id ? { ...ei, ...updatedItem } : ei
+          );
+      setNumChanges(new_data.filter((ei) => hasEntityChanged(ei)).length);
+      return new_data;
+    });
+  };

-  const onDialogDup = useCallback((item: EntityItem) => {
+  const onDialogDup = (item: EntityItem) => {
    setCreating(true);
    setSelectedEntityItem({
      id: Math.floor(Math.random() * (MAX_ID - MIN_ID) + MIN_ID),
@@ -228,9 +219,9 @@ const CustomEntities = () => {
      value: item.value
    });
    setDialogOpen(true);
-  }, []);
+  };

-  const addEntityItem = useCallback(() => {
+  const addEntityItem = () => {
    setCreating(true);
    setSelectedEntityItem({
      id: Math.floor(Math.random() * (MAX_ID - MIN_ID) + MIN_ID),
@@ -248,30 +239,27 @@ const CustomEntities = () => {
      value: ''
    });
    setDialogOpen(true);
-  }, []);
+  };

-  const formatValue = useCallback((value: unknown, uom: number) => {
+  const formatValue = (value: unknown, uom: number) => {
    return value === undefined
      ? ''
      : typeof value === 'number'
        ? new Intl.NumberFormat().format(value) +
          (uom === 0 ? '' : ` ${DeviceValueUOM_s[uom]}`)
        : `${value as string}${uom === 0 ? '' : ` ${DeviceValueUOM_s[uom]}`}`;
-  }, []);
+  };

-  const showHex = useCallback((value: number, digit: number) => {
+  const showHex = (value: number, digit: number) => {
    return `0x${value.toString(16).toUpperCase().padStart(digit, '0')}`;
-  }, []);
+  };

-  const filteredAndSortedEntities = useMemo(
-    () =>
-      entities
-        ?.filter((ei: EntityItem) => !ei.deleted)
-        .sort((a: EntityItem, b: EntityItem) => a.name.localeCompare(b.name)) ?? [],
-    [entities]
-  );
+  const filteredAndSortedEntities =
+    entities
+      ?.filter((ei: EntityItem) => !ei.deleted)
+      .sort((a: EntityItem, b: EntityItem) => a.name.localeCompare(b.name)) ?? [];

-  const renderEntity = useCallback(() => {
+  const renderEntity = () => {
    if (!entities) {
      return (
        <FormLoader onRetry={fetchEntities} errorMessage={error?.message || ''} />
@@ -328,17 +316,7 @@ const CustomEntities = () => {
        )}
      </Table>
    );
-  }, [
-    entities,
-    error,
-    fetchEntities,
-    entity_theme,
-    editEntityItem,
-    LL,
-    filteredAndSortedEntities,
-    showHex,
-    formatValue
-  ]);
+  };

  return (
    <SectionContent>
@@ -1,4 +1,4 @@
-import { useCallback, useEffect, useMemo, useState } from 'react';
+import { useEffect, useState } from 'react';

 import AddIcon from '@mui/icons-material/Add';
 import CancelIcon from '@mui/icons-material/Cancel';
@@ -23,12 +23,12 @@ import {
 } from '@mui/material';

 import { dialogStyle } from 'CustomTheme';
-import type Schema from 'async-validator';
-import type { ValidateFieldsError } from 'async-validator';
 import { BlockFormControlLabel, ValidatedTextField } from 'components';
 import { useI18nContext } from 'i18n/i18n-react';
 import { numberValue, updateValue } from 'utils';
 import { ValidationError, validate } from 'validators';
+import type Schema from 'validators/schema';
+import type { ValidateFieldsError } from 'validators/schema';

 import { DeviceValueType, DeviceValueTypeNames, DeviceValueUOM_s } from './types';
 import type { EntityItem } from './types';
@@ -68,14 +68,10 @@ const CustomEntitiesDialog = ({
  const { LL } = useI18nContext();
  const [editItem, setEditItem] = useState<EntityItem>(selectedItem);
  const [fieldErrors, setFieldErrors] = useState<ValidateFieldsError>();
-  const updateFormValue = useMemo(
-    () =>
-      updateValue(
-        setEditItem as unknown as React.Dispatch<
-          React.SetStateAction<Record<string, unknown>>
-        >
-      ),
-    []
+  const updateFormValue = updateValue(
+    setEditItem as unknown as React.Dispatch<
+      React.SetStateAction<Record<string, unknown>>
+    >
  );

  useEffect(() => {
@@ -105,16 +101,16 @@ const CustomEntitiesDialog = ({
    }
  }, [open, selectedItem]);

-  const handleClose = useCallback(
-    (_event: React.SyntheticEvent, reason: 'backdropClick' | 'escapeKeyDown') => {
-      if (reason !== 'backdropClick') {
-        onClose();
-      }
-    },
-    [onClose]
-  );
+  const handleClose = (
+    _event: React.SyntheticEvent,
+    reason: 'backdropClick' | 'escapeKeyDown'
+  ) => {
+    if (reason !== 'backdropClick') {
+      onClose();
+    }
+  };

-  const save = useCallback(async () => {
+  const save = async () => {
    try {
      setFieldErrors(undefined);
      await validate(validator, editItem);
@@ -138,27 +134,21 @@ const CustomEntitiesDialog = ({
    } catch (error) {
      setFieldErrors((error as ValidationError).fieldErrors);
    }
-  }, [validator, editItem, onSave]);
+  };

-  const remove = useCallback(() => {
-    const itemWithDeleted = { ...editItem, deleted: true };
-    onSave(itemWithDeleted);
-  }, [editItem, onSave]);
+  const remove = () => {
+    onSave({ ...editItem, deleted: true });
+  };

-  const dup = useCallback(() => {
+  const dup = () => {
    onDup(editItem);
-  }, [editItem, onDup]);
+  };

-  // Memoize UOM menu items to avoid recreating on every render
-  const uomMenuItems = useMemo(
-    () =>
-      DeviceValueUOM_s.map((val, i) => (
-        <MenuItem key={val} value={i}>
-          {val}
-        </MenuItem>
-      )),
-    []
-  );
+  const uomMenuItems = DeviceValueUOM_s.map((val, i) => (
+    <MenuItem key={val} value={i}>
+      {val}
+    </MenuItem>
+  ));

  return (
    <Dialog sx={dialogStyle} open={open} onClose={handleClose}>
@@ -1,6 +1,5 @@
-import { useCallback, useEffect, useMemo, useState } from 'react';
+import { useEffect, useState } from 'react';
 import { useBlocker, useLocation } from 'react-router';
-import { toast } from 'react-toastify';

 import CancelIcon from '@mui/icons-material/Cancel';
 import EditIcon from '@mui/icons-material/Edit';
@@ -46,6 +45,7 @@ import {
  SectionContent,
  useLayoutTitle
 } from 'components';
+import { toast } from 'components/toast';
 import { useI18nContext } from 'i18n/i18n-react';

 import {
@@ -171,19 +171,17 @@ const Customizations = () => {
    );
  };

-  const entities_theme = useMemo(
-    () =>
-      useTheme({
-        Table: `
+  const entities_theme = useTheme({
+    Table: `
      --data-table-library_grid-template-columns: 156px repeat(1, minmax(80px, 1fr)) 45px minmax(45px, auto) minmax(120px, auto);
    `,
-        BaseRow: `
+    BaseRow: `
      font-size: 14px;
      .td {
        height: 32px;
      }
    `,
-        BaseCell: `
+    BaseCell: `
      &:nth-of-type(3) {
        text-align: right;
      }
@@ -194,7 +192,7 @@ const Customizations = () => {
        text-align: right;
      }
    `,
-        HeaderRow: `
+    HeaderRow: `
      text-transform: uppercase;
      background-color: black;
      color: #90CAF9;
@@ -206,7 +204,7 @@ const Customizations = () => {
        text-align: center;
      }
    `,
-        Row: `
+    Row: `
      background-color: #1e1e1e;
      position: relative;
      cursor: pointer;
@@ -222,7 +220,7 @@ const Customizations = () => {
        background-color: #177ac9;
      }
    `,
-        Cell: `
+    Cell: `
      &:nth-of-type(2) {
        padding: 8px;
      }
@@ -236,9 +234,7 @@ const Customizations = () => {
        padding-right: 8px;
      }
    `
-      }),
-    []
-  );
+  });

  function hasEntityChanged(de: DeviceEntity) {
    return (
@@ -287,26 +283,23 @@ const Customizations = () => {
    return value as string;
  }

-  const isCommand = useCallback((de: DeviceEntity) => {
+  const isCommand = (de: DeviceEntity) => {
    return de.n && de.n[0] === '!';
-  }, []);
+  };

-  const formatName = useCallback(
-    (de: DeviceEntity, withShortname: boolean) => {
-      let name: string;
-      if (isCommand(de)) {
-        name = de.t
-          ? `${LL.COMMAND(1)}: ${de.t} ${de.n?.slice(1)}`
-          : `${LL.COMMAND(1)}: ${de.n?.slice(1)}`;
-      } else if (de.cn && de.cn !== '') {
-        name = de.t ? `${de.t} ${de.cn}` : de.cn;
-      } else {
-        name = de.t ? `${de.t} ${de.n}` : de.n || '';
-      }
-      return withShortname ? `${name} ${de.id}` : name;
-    },
-    [LL]
-  );
+  const formatName = (de: DeviceEntity, withShortname: boolean) => {
+    let name: string;
+    if (isCommand(de)) {
+      name = de.t
+        ? `${LL.COMMAND(1)}: ${de.t} ${de.n?.slice(1)}`
+        : `${LL.COMMAND(1)}: ${de.n?.slice(1)}`;
+    } else if (de.cn && de.cn !== '') {
+      name = de.t ? `${de.t} ${de.cn}` : de.cn;
+    } else {
+      name = de.t ? `${de.t} ${de.n}` : de.n || '';
+    }
+    return withShortname ? `${name} ${de.id}` : name;
+  };

  const getMaskNumber = (newMask: string[]) => {
    let new_mask = 0;
@@ -336,33 +329,27 @@ const Customizations = () => {
    return new_masks;
  };

-  const filter_entity = useCallback(
-    (de: DeviceEntity) =>
-      (de.m & selectedFilters || !selectedFilters) &&
-      formatName(de, true).toLowerCase().includes(search.toLowerCase()),
-    [selectedFilters, search, formatName]
-  );
+  const filter_entity = (de: DeviceEntity) =>
+    (de.m & selectedFilters || !selectedFilters) &&
+    formatName(de, true).toLowerCase().includes(search.toLowerCase());

-  const maskDisabled = useCallback(
-    (set: boolean) => {
-      setDeviceEntities((prev) =>
-        prev.map((de) => {
-          if (filter_entity(de)) {
-            const excludeMask =
-              DeviceEntityMask.DV_API_MQTT_EXCLUDE | DeviceEntityMask.DV_WEB_EXCLUDE;
-            return {
-              ...de,
-              m: set ? de.m | excludeMask : de.m & ~excludeMask
-            };
-          }
-          return de;
-        })
-      );
-    },
-    [filter_entity]
-  );
+  const maskDisabled = (set: boolean) => {
+    setDeviceEntities((prev) =>
+      prev.map((de) => {
+        if (filter_entity(de)) {
+          const excludeMask =
+            DeviceEntityMask.DV_API_MQTT_EXCLUDE | DeviceEntityMask.DV_WEB_EXCLUDE;
+          return {
+            ...de,
+            m: set ? de.m | excludeMask : de.m & ~excludeMask
+          };
+        }
+        return de;
+      })
+    );
+  };

-  const resetCustomization = useCallback(async () => {
+  const resetCustomization = async () => {
    try {
      await sendResetCustomizations();
      toast.info(LL.CUSTOMIZATIONS_RESTART());
@@ -372,30 +359,27 @@ const Customizations = () => {
      setConfirmReset(false);
      setRestarting(true);
    }
-  }, [sendResetCustomizations, LL]);
+  };

  const onDialogClose = () => {
    setDialogOpen(false);
  };

-  const updateDeviceEntity = useCallback((updatedItem: DeviceEntity) => {
+  const updateDeviceEntity = (updatedItem: DeviceEntity) => {
    setDeviceEntities(
      (prev) =>
        prev?.map((de) =>
          de.id === updatedItem.id ? { ...de, ...updatedItem } : de
        ) ?? []
    );
-  }, []);
+  };

-  const onDialogSave = useCallback(
-    (updatedItem: DeviceEntity) => {
-      setDialogOpen(false);
-      updateDeviceEntity(updatedItem);
-    },
-    [updateDeviceEntity]
-  );
+  const onDialogSave = (updatedItem: DeviceEntity) => {
+    setDialogOpen(false);
+    updateDeviceEntity(updatedItem);
+  };

-  const editDeviceEntity = useCallback((de: DeviceEntity) => {
+  const editDeviceEntity = (de: DeviceEntity) => {
    if (de.n === undefined || (de.n && de.n[0] === '!')) {
      return;
    }
@@ -406,9 +390,9 @@ const Customizations = () => {

    setSelectedDeviceEntity(de);
    setDialogOpen(true);
-  }, []);
+  };

-  const saveCustomization = useCallback(async () => {
+  const saveCustomization = async () => {
    if (!devices || !deviceEntities || selectedDevice === -1) {
      return;
    }
@@ -441,9 +425,9 @@ const Customizations = () => {
      .finally(() => {
        setOriginalSettings(deviceEntities);
      });
-  }, [devices, deviceEntities, selectedDevice, sendCustomizationEntities, LL]);
+  };

-  const renameDevice = useCallback(async () => {
+  const renameDevice = async () => {
    await sendDeviceName({
      id: selectedDevice,
      name: selectedDeviceName,
@@ -459,14 +443,7 @@ const Customizations = () => {
        setRename(false);
        await fetchCoreData();
      });
-  }, [
-    selectedDevice,
-    selectedDeviceName,
-    selectedDeviceBrand,
-    sendDeviceName,
-    LL,
-    fetchCoreData
-  ]);
+  };

  const renderDeviceList = () => (
    <>
@@ -512,7 +489,8 @@ const Customizations = () => {
            </MenuItem>
            {devices.devices.map(
              (device: Device) =>
-                device.id < 90 && (
+                device.id < 90 &&
+                device.e !== 0 && (
                  <MenuItem key={device.id} value={device.id}>
                    {device.n}&nbsp;({device.tn})
                  </MenuItem>
@@ -562,10 +540,7 @@ const Customizations = () => {
    </>
  );

-  const filteredEntities = useMemo(
-    () => deviceEntities.filter((de) => filter_entity(de)),
-    [deviceEntities, filter_entity]
-  );
+  const filteredEntities = deviceEntities.filter((de) => filter_entity(de));

  const renderDeviceData = () => {
    return (
@@ -1,4 +1,4 @@
-import { memo, useCallback, useEffect, useMemo, useState } from 'react';
+import { memo, useEffect, useState } from 'react';

 import CancelIcon from '@mui/icons-material/Cancel';
 import CloseIcon from '@mui/icons-material/Close';
@@ -57,23 +57,16 @@ const CustomizationsDialog = ({
  const [editItem, setEditItem] = useState<DeviceEntity>(selectedItem);
  const [error, setError] = useState<boolean>(false);

-  const updateFormValue = useMemo(
-    () =>
-      updateValue(
-        setEditItem as unknown as React.Dispatch<
-          React.SetStateAction<Record<string, unknown>>
-        >
-      ),
-    []
+  const updateFormValue = updateValue(
+    setEditItem as unknown as React.Dispatch<
+      React.SetStateAction<Record<string, unknown>>
+    >
  );

-  const isWriteableNumber = useMemo(
-    () =>
-      typeof editItem.v === 'number' &&
-      editItem.w &&
-      !(editItem.m & DeviceEntityMask.DV_READONLY),
-    [editItem.v, editItem.w, editItem.m]
-  );
+  const isWriteableNumber =
+    typeof editItem.v === 'number' &&
+    editItem.w &&
+    !(editItem.m & DeviceEntityMask.DV_READONLY);

  useEffect(() => {
    if (open) {
@@ -82,16 +75,16 @@ const CustomizationsDialog = ({
    }
  }, [open, selectedItem]);

-  const handleClose = useCallback(
-    (_event: React.SyntheticEvent, reason: 'backdropClick' | 'escapeKeyDown') => {
-      if (reason !== 'backdropClick') {
-        onClose();
-      }
-    },
-    [onClose]
-  );
+  const handleClose = (
+    _event: React.SyntheticEvent,
+    reason: 'backdropClick' | 'escapeKeyDown'
+  ) => {
+    if (reason !== 'backdropClick') {
+      onClose();
+    }
+  };

-  const save = useCallback(() => {
+  const save = () => {
    if (
      isWriteableNumber &&
      editItem.mi &&
@@ -102,34 +95,31 @@ const CustomizationsDialog = ({
    } else {
      onSave(editItem);
    }
-  }, [isWriteableNumber, editItem, onSave]);
+  };

-  const updateDeviceEntity = useCallback((updatedItem: DeviceEntity) => {
+  const updateDeviceEntity = (updatedItem: DeviceEntity) => {
    setEditItem((prev) => ({ ...prev, m: updatedItem.m }));
-  }, []);
-
-  const dialogTitle = useMemo(() => `${LL.EDIT()} ${LL.ENTITY()}`, [LL]);
-
-  const writeableIcon = useMemo(
-    () =>
-      editItem.w ? (
-        <DoneIcon color="success" sx={{ fontSize: ICON_SIZE }} />
-      ) : (
-        <CloseIcon color="error" sx={{ fontSize: ICON_SIZE }} />
-      ),
-    [editItem.w]
-  );
+  };

  return (
    <Dialog sx={dialogStyle} open={open} onClose={handleClose}>
-      <DialogTitle>{dialogTitle}</DialogTitle>
+      <DialogTitle>{`${LL.EDIT()} ${LL.ENTITY()}`}</DialogTitle>
      <DialogContent dividers>
        <LabelValue label={LL.ID_OF(LL.ENTITY())} value={editItem.id} />
        <LabelValue
          label={`${LL.DEFAULT(1)} ${LL.ENTITY_NAME(1)}`}
          value={editItem.n}
        />
-        <LabelValue label={LL.WRITEABLE()} value={writeableIcon} />
+        <LabelValue
+          label={LL.WRITEABLE()}
+          value={
+            editItem.w ? (
+              <DoneIcon color="success" sx={{ fontSize: ICON_SIZE }} />
+            ) : (
+              <CloseIcon color="error" sx={{ fontSize: ICON_SIZE }} />
+            )
+          }
+        />

        <Box sx={{ mt: 1, mb: 2 }}>
          <EntityMaskToggle onUpdate={updateDeviceEntity} de={editItem} />
@@ -1,12 +1,12 @@
-import { memo, useCallback, useContext, useEffect, useMemo, useState } from 'react';
+import { memo, useContext, useEffect, useState } from 'react';
 import { IconContext } from 'react-icons/lib';
 import { Link } from 'react-router';
-import { toast } from 'react-toastify';

 import ChevronRightIcon from '@mui/icons-material/ChevronRight';
 import EditIcon from '@mui/icons-material/Edit';
 import ExpandMoreIcon from '@mui/icons-material/ExpandMore';
 import HelpOutlineIcon from '@mui/icons-material/HelpOutlined';
+import PlayArrowIcon from '@mui/icons-material/PlayArrow';
 import UnfoldLessIcon from '@mui/icons-material/UnfoldLess';
 import UnfoldMoreIcon from '@mui/icons-material/UnfoldMore';
 import {
@@ -29,6 +29,7 @@ import {
  SectionContent,
  useLayoutTitle
 } from 'components';
+import { toast } from 'components/toast';
 import { AuthenticatedContext } from 'contexts/authentication';
 import { useI18nContext } from 'i18n/i18n-react';
 import { useInterval, usePersistState } from 'utils';
@@ -75,42 +76,38 @@ const Dashboard = memo(() => {
    {
      immediate: false
    }
-  );
+  )
+    .onSuccess(() => {
+      toast.success(LL.WRITE_CMD_SENT());
+    })
+    .onError((error) => {
+      toast.error(String(error.error?.message || 'An error occurred'));
+    });

-  const deviceValueDialogSave = useCallback(
-    async (devicevalue: DeviceValue) => {
-      if (!selectedDashboardItem) {
-        return;
-      }
+  const deviceValueDialogSave = async (devicevalue: DeviceValue) => {
+    if (!selectedDashboardItem) {
+      return;
+    }
+    // skip if we're executing an immediate schedule as this is handled in DevicesDialog::doAction()
+    if (devicevalue.v !== undefined) {
      const id = selectedDashboardItem.parentNode.id; // this is the parent ID
-      await sendDeviceValue({ id, c: devicevalue.c ?? '', v: devicevalue.v })
-        .then(() => {
-          toast.success(LL.WRITE_CMD_SENT());
-        })
-        .catch((error: Error) => {
-          toast.error(error.message);
-        })
-        .finally(() => {
-          setDeviceValueDialogOpen(false);
-          setSelectedDashboardItem(undefined);
-        });
-    },
-    [selectedDashboardItem, sendDeviceValue, LL]
-  );
+      await sendDeviceValue({ id, c: devicevalue.c ?? '', v: devicevalue.v });
+    }
+    setDeviceValueDialogOpen(false);
+    setSelectedDashboardItem(undefined);
+  };

-  const dashboard_theme = useMemo(
-    () =>
-      useTheme({
-        Table: `
+  const dashboard_theme = useTheme({
+    Table: `
      --data-table-library_grid-template-columns: minmax(80px, auto) 120px 32px;
    `,
-        BaseRow: `
+    BaseRow: `
      font-size: 14px;
      .td {
        height: 28px;
      }
    `,
-        Row: `
+    Row: `
      cursor: pointer;
      background-color: #1e1e1e;
      &:nth-of-type(odd) .td {
@@ -120,7 +117,7 @@ const Dashboard = memo(() => {
        background-color: #177ac9;
      },
    `,
-        BaseCell: `
+    BaseCell: `
      &:nth-of-type(2) {
        text-align: right;
      }
@@ -128,9 +125,7 @@ const Dashboard = memo(() => {
        text-align: right;
      }
    `
-      }),
-    []
-  );
+  });

  const tree = useTree(
    { nodes: [...data.nodes] },
@@ -164,79 +159,71 @@ const Dashboard = memo(() => {
    }
  });

-  const nodeIds = useMemo(
-    () => data.nodes.map((item: DashboardItem) => item.id),
-    [data.nodes]
-  );
-
  useEffect(() => {
+    const nodeIds = data.nodes.map((item: DashboardItem) => item.id);
    showAll
      ? tree.fns.onAddAll(nodeIds) // expand tree
      : tree.fns.onRemoveAll(); // collapse tree
  }, [parentNodes]);

-  const showType = useCallback(
-    (n?: string, t?: number) => {
-      // if we have a name show it
-      if (n) {
-        return n;
+  const showType = (n?: string, t?: number) => {
+    // if we have a name show it
+    if (n) {
+      return n;
+    }
+    if (t) {
+      // otherwise pick translation based on type
+      switch (t) {
+        case DeviceType.CUSTOM:
+          return LL.CUSTOM_ENTITIES(0);
+        case DeviceType.ANALOGSENSOR:
+          return LL.ANALOG_SENSORS();
+        case DeviceType.TEMPERATURESENSOR:
+          return LL.TEMP_SENSORS();
+        case DeviceType.COMMAND:
+          return LL.COMMANDS();
+        case DeviceType.SCHEDULER:
+          return LL.SCHEDULER();
+        default:
+          break;
      }
-      if (t) {
-        // otherwise pick translation based on type
-        switch (t) {
-          case DeviceType.CUSTOM:
-            return LL.CUSTOM_ENTITIES(0);
-          case DeviceType.ANALOGSENSOR:
-            return LL.ANALOG_SENSORS();
-          case DeviceType.TEMPERATURESENSOR:
-            return LL.TEMP_SENSORS();
-          case DeviceType.SCHEDULER:
-            return LL.SCHEDULER();
-          default:
-            break;
-        }
-      }
-      return '';
-    },
-    [LL]
-  );
+    }
+    return '';
+  };

-  const showName = useCallback(
-    (di: DashboardItem) => {
-      if (di.id < 100) {
-        // if its a device (parent node) and has entities
-        if (di.nodes?.length) {
-          return (
-            <span style={{ fontSize: '15px' }}>
-              <DeviceIcon type_id={di.t ?? 0} />
-              &nbsp;&nbsp;{showType(di.n, di.t)}
-              <span style={{ color: 'lightblue' }}>&nbsp;({di.nodes?.length})</span>
-            </span>
-          );
-        }
+  const showName = (di: DashboardItem) => {
+    if (di.id < 100) {
+      // if its a device (parent node) and has entities
+      if (di.nodes?.length) {
+        return (
+          <span style={{ fontSize: '15px' }}>
+            <DeviceIcon type_id={di.t ?? 0} />
+            &nbsp;&nbsp;{showType(di.n, di.t)}
+            <span style={{ color: 'lightblue' }}>&nbsp;({di.nodes?.length})</span>
+          </span>
+        );
      }
-      if (di.dv) {
-        return <span>{di.dv.id.slice(2)}</span>;
-      }
-      return null;
-    },
-    [showType]
-  );
+    }
+    if (di.dv) {
+      return <span>{di.dv.id.slice(2)}</span>;
+    }
+    return null;
+  };

-  const hasMask = useCallback(
-    (id: string, mask: number) => (parseInt(id.slice(0, 2), 16) & mask) === mask,
-    []
-  );
+  const hasMask = (id: string, mask: number) =>
+    (parseInt(id.slice(0, 2), 16) & mask) === mask;

-  const editDashboardValue = useCallback(
-    (di: DashboardItem) => {
-      if (me.admin && di.dv?.c) {
-        setSelectedDashboardItem(di);
-        setDeviceValueDialogOpen(true);
-      }
-    },
-    [me.admin]
-  );
+  const editDashboardValue = (di: DashboardItem) => {
+    // don't execute on parent nodes
+    if (!me.admin || di.id <= 99) {
+      return;
+    }
+
+    if (di.dv?.c) {
+      setSelectedDashboardItem(di);
+      setDeviceValueDialogOpen(true);
+    }
+  };

  const handleShowAll = (
    _event: React.MouseEvent<HTMLElement>,
@@ -248,10 +235,9 @@ const Dashboard = memo(() => {
    }
  };

-  const hasFavEntities = useMemo(
-    () => data.nodes.filter((item: DashboardItem) => item.id <= 90).length,
-    [data.nodes]
-  );
+  const hasFavEntities = data.nodes.filter(
+    (item: DashboardItem) => item.id <= 90
+  ).length;

  const renderContent = () => {
    if (!data) {
@@ -344,20 +330,34 @@ const Dashboard = memo(() => {
                            <Cell>
                              {me.admin &&
                                di.dv?.c &&
-                                !hasMask(di.dv.id, DeviceEntityMask.DV_READONLY) && (
+                                !hasMask(di.dv.id, DeviceEntityMask.DV_READONLY) &&
+                                (di.dv.v === '' || di.dv.v === undefined ? (
+                                  <IconButton
+                                    size="small"
+                                    aria-label={LL.RUN()}
+                                    onClick={() => editDashboardValue(di)}
+                                    style={{ backgroundColor: 'transparent' }}
+                                  >
+                                    <PlayArrowIcon
+                                      color="primary"
+                                      sx={{ fontSize: 16 }}
+                                    />
+                                  </IconButton>
+                                ) : (
                                  <IconButton
                                    size="small"
                                    aria-label={
                                      LL.CHANGE_VALUE() + ' ' + LL.VALUE(0)
                                    }
                                    onClick={() => editDashboardValue(di)}
+                                    style={{ backgroundColor: 'transparent' }}
                                  >
                                    <EditIcon
                                      color="primary"
                                      sx={{ fontSize: 16 }}
                                    />
                                  </IconButton>
-                                )}
+                                ))}
                            </Cell>
                          </>
                        ) : (
@@ -402,7 +402,10 @@ const Dashboard = memo(() => {
      {selectedDashboardItem && selectedDashboardItem.dv && (
        <DevicesDialog
          open={deviceValueDialogOpen}
-          onClose={() => setDeviceValueDialogOpen(false)}
+          onClose={() => {
+            setDeviceValueDialogOpen(false);
+            setSelectedDashboardItem(undefined);
+          }}
          onSave={deviceValueDialogSave}
          selectedItem={selectedDashboardItem.dv}
          writeable={true}
@@ -38,6 +38,7 @@ const deviceIconLookup: Record<DeviceType, IconType | null> = {
  [DeviceType.CUSTOM]: MdPlaylistAdd,
  [DeviceType.UNKNOWN]: MdOutlineSensors,
  [DeviceType.SYSTEM]: null,
+  [DeviceType.COMMAND]: MdPlaylistAdd,
  [DeviceType.SCHEDULER]: MdMoreTime,
  [DeviceType.GENERIC]: MdOutlineSensors,
  [DeviceType.VENTILATION]: PiFan
@@ -4,12 +4,10 @@ import {
  useContext,
  useEffect,
  useLayoutEffect,
-  useMemo,
  useState
 } from 'react';
 import { IconContext } from 'react-icons';
 import { Link, useNavigate } from 'react-router';
-import { toast } from 'react-toastify';

 import CommentsDisabledOutlinedIcon from '@mui/icons-material/CommentsDisabledOutlined';
 import ConstructionIcon from '@mui/icons-material/Construction';
@@ -65,6 +63,7 @@ import {
  SectionContent,
  useLayoutTitle
 } from 'components';
+import { toast } from 'components/toast';
 import { AuthenticatedContext } from 'contexts/authentication';
 import { useI18nContext } from 'i18n/i18n-react';
 import { useInterval } from 'utils';
@@ -133,21 +132,19 @@ const Devices = memo(() => {
    };
  }, []);

-  const leftOffset = useCallback(() => {
+  const leftOffset = () => {
    const devicesWindow = document.getElementById('devices-window');
    if (!devicesWindow) return 0;
    const { left, right } = devicesWindow.getBoundingClientRect();
    if (!left || !right) return 0;
    return left + (right - left < 400 ? 0 : 200);
-  }, []);
+  };

-  const common_theme = useMemo(
-    () =>
-      useTheme({
-        BaseRow: `
+  const common_theme = useTheme({
+    BaseRow: `
      font-size: 14px;
    `,
-        HeaderRow: `
+    HeaderRow: `
      text-transform: uppercase;
      background-color: black;
      color: #90CAF9;
@@ -155,7 +152,7 @@ const Devices = memo(() => {
        border-bottom: 1px solid #565656;
      }
    `,
-        Row: `
+    Row: `
      cursor: pointer;
      background-color: #1E1E1E;
      .td {
@@ -165,88 +162,78 @@ const Devices = memo(() => {
        background-color: #177ac9;
      }
    `
-      }),
-    []
-  );
+  });

-  const device_theme = useMemo(
-    () =>
-      useTheme([
-        common_theme,
-        {
-          BaseRow: `
-          font-size: 15px;
-          .td {
-           height: 28px;
-          }
-        `,
-          Table: `
-        --data-table-library_grid-template-columns: repeat(1, minmax(0, 1fr)) 130px;
-      `,
-          HeaderRow: `
-        .th {
-          padding: 8px;
-      `,
-          Row: `
-        &:nth-of-type(odd) .td {
-            background-color: #303030;
-        },
-        &:hover .td {
-          background-color: #177ac9;
-        },
-      `
-        }
-      ]),
-    [common_theme]
-  );
-
-  const data_theme = useMemo(
-    () =>
-      useTheme([
-        common_theme,
-        {
-          Table: `
-        --data-table-library_grid-template-columns: minmax(200px, auto) minmax(150px, auto) 40px;
-        height: auto;
-        max-height: 100%;
-        overflow-y: scroll;
-        ::-webkit-scrollbar {
-          display:none;
+  const device_theme = useTheme([
+    common_theme,
+    {
+      BaseRow: `
+        font-size: 15px;
+        .td {
+         height: 28px;
        }
      `,
-          BaseRow: `
-      .td {
-        height: 32px;
-      }
-     `,
-          BaseCell: `
-        &:nth-of-type(1) {
-          border-left: 1px solid #177ac9;
-        },
-        &:nth-of-type(2) {
-          text-align: right;
-        },
-        &:nth-of-type(3) {
-          border-right: 1px solid #177ac9;
-        }
-      `,
-          HeaderRow: `
-        .th {
-          border-top: 1px solid #565656;
-        }
-      `,
-          Row: `
-        &:nth-of-type(odd) .td {
+      Table: `
+      --data-table-library_grid-template-columns: repeat(1, minmax(0, 1fr)) 170px;
+    `,
+      HeaderRow: `
+      .th {
+        padding: 8px;
+    `,
+      Row: `
+      &:nth-of-type(odd) .td {
          background-color: #303030;
-        },
-        &:hover .td {
-          background-color: #177ac9;
+      },
+      &:hover .td {
+        background-color: #177ac9;
+      },
+    `
+    }
+  ]);
+
+  const data_theme = useTheme([
+    common_theme,
+    {
+      Table: `
+      --data-table-library_grid-template-columns: minmax(200px, auto) minmax(150px, auto) 40px;
+      height: auto;
+      max-height: 100%;
+      overflow-y: scroll;
+      ::-webkit-scrollbar {
+        display:none;
      }
-      `
-        }
-      ]),
-    [common_theme]
-  );
+    `,
+      BaseRow: `
+    .td {
+      height: 32px;
+    }
+   `,
+      BaseCell: `
+      &:nth-of-type(1) {
+        border-left: 1px solid #177ac9;
+      },
+      &:nth-of-type(2) {
+        text-align: right;
+      },
+      &:nth-of-type(3) {
+        border-right: 1px solid #177ac9;
+      }
+    `,
+      HeaderRow: `
+      .th {
+        border-top: 1px solid #565656;
+      }
+    `,
+      Row: `
+      &:nth-of-type(odd) .td {
+        background-color: #303030;
+      },
+      &:hover .td {
+        background-color: #177ac9;
+    }
+    `
+    }
+  ]);

  const getSortIcon = (state: State, sortKey: unknown) => {
    if (state.sortKey === sortKey && state.reverse) {
@@ -345,10 +332,8 @@ const Devices = memo(() => {
    return sc;
  };

-  const hasMask = useCallback(
-    (id: string, mask: number) => (parseInt(id.slice(0, 2), 16) & mask) === mask,
-    []
-  );
+  const hasMask = (id: string, mask: number) =>
+    (parseInt(id.slice(0, 2), 16) & mask) === mask;

  const handleDownloadCsv = () => {
    const deviceIndex = coreData.devices.findIndex(
@@ -573,16 +558,26 @@ const Devices = memo(() => {
                      <CircularProgress sx={{ margin: 1 }} size={18} />
                    )}
                    {tableList.map((device: Device) => (
-                      <Row key={device.id} item={device}>
+                      <Row key={device.id} item={device} disabled={device.e === 0}>
                        <Cell>
                          <DeviceIcon type_id={device.t} />
                          &nbsp;&nbsp;
-                          {device.n}
-                          <span style={{ color: 'lightblue' }}>
-                            &nbsp;&nbsp;({device.e})
+                          <span style={{ color: device.e === 0 ? 'grey' : 'white' }}>
+                            {device.n}
                          </span>
+                          {device.e !== 0 && (
+                            <span style={{ color: 'lightblue' }}>
+                              &nbsp;&nbsp;({device.e})
+                            </span>
+                          )}
+                        </Cell>
+                        <Cell stiff>
+                          <ButtonTooltip
+                            title={`DeviceID: 0x${('00' + device.d.toString(16).toUpperCase()).slice(-2)}, ProductID: ${device.p}`}
+                          >
+                            <span>{device.tn}</span>
+                          </ButtonTooltip>
                        </Cell>
-                        <Cell stiff>{device.tn}</Cell>
                      </Row>
                    ))}
                  </Body>
@@ -597,6 +592,7 @@ const Devices = memo(() => {

  const deviceValueDialogClose = () => {
    setDeviceValueDialogOpen(false);
+    setSelectedDeviceValue(undefined);
    if (selectedDevice !== undefined) {
      void sendDeviceData(selectedDevice);
    }
@@ -607,41 +603,35 @@ const Devices = memo(() => {
      return;
    }

-    const showDeviceValue = useCallback((dv: DeviceValue) => {
+    const showDeviceValue = (dv: DeviceValue) => {
      setSelectedDeviceValue(dv);
      setDeviceValueDialogOpen(true);
-    }, []);
+    };

-    const renderNameCell = useCallback(
-      (dv: DeviceValue) => (
-        <>
-          {dv.id.slice(2)}&nbsp;
-          {hasMask(dv.id, DeviceEntityMask.DV_FAVORITE) && (
-            <StarIcon color="primary" sx={{ fontSize: 12 }} />
-          )}
-          {hasMask(dv.id, DeviceEntityMask.DV_READONLY) && (
-            <EditOffOutlinedIcon color="primary" sx={{ fontSize: 12 }} />
-          )}
-          {hasMask(dv.id, DeviceEntityMask.DV_API_MQTT_EXCLUDE) && (
-            <CommentsDisabledOutlinedIcon color="primary" sx={{ fontSize: 12 }} />
-          )}
-        </>
-      ),
-      [hasMask]
+    const renderNameCell = (dv: DeviceValue) => (
+      <>
+        {dv.id.slice(2)}&nbsp;
+        {hasMask(dv.id, DeviceEntityMask.DV_FAVORITE) && (
+          <StarIcon color="primary" sx={{ fontSize: 12 }} />
+        )}
+        {hasMask(dv.id, DeviceEntityMask.DV_READONLY) && (
+          <EditOffOutlinedIcon color="primary" sx={{ fontSize: 12 }} />
+        )}
+        {hasMask(dv.id, DeviceEntityMask.DV_API_MQTT_EXCLUDE) && (
+          <CommentsDisabledOutlinedIcon color="primary" sx={{ fontSize: 12 }} />
+        )}
+      </>
    );

-    const shown_data = useMemo(() => {
-      if (onlyFav) {
-        return deviceData.nodes.filter(
+    const shown_data = onlyFav
+      ? deviceData.nodes.filter(
          (dv: DeviceValue) =>
            hasMask(dv.id, DeviceEntityMask.DV_FAVORITE) &&
            dv.id.slice(2).toLowerCase().includes(search.toLowerCase())
+        )
+      : deviceData.nodes.filter((dv: DeviceValue) =>
+          dv.id.slice(2).toLowerCase().includes(search.toLowerCase())
        );
-      }
-      return deviceData.nodes.filter((dv: DeviceValue) =>
-        dv.id.slice(2).toLowerCase().includes(search.toLowerCase())
-      );
-    }, [deviceData.nodes, onlyFav, search]);

    const deviceIndex = coreData.devices.findIndex(
      (d: Device) => d.id === device_select.state.id
@@ -798,6 +788,7 @@ const Devices = memo(() => {
                          <IconButton
                            size="small"
                            onClick={() => showDeviceValue(dv)}
+                            style={{ backgroundColor: 'transparent' }}
                          >
                            {dv.v === '' ? (
                              <PlayArrowIcon color="primary" sx={{ fontSize: 16 }} />
@@ -1,6 +1,7 @@
-import { useCallback, useEffect, useMemo, useState } from 'react';
+import { useEffect, useState } from 'react';

 import CancelIcon from '@mui/icons-material/Cancel';
+import PlayArrowIcon from '@mui/icons-material/PlayArrow';
 import WarningIcon from '@mui/icons-material/Warning';
 import {
  Box,
@@ -18,15 +19,18 @@ import {
  Typography
 } from '@mui/material';

+import { callAction } from '@/api/app';
 import { dialogStyle } from 'CustomTheme';
-import type Schema from 'async-validator';
-import type { ValidateFieldsError } from 'async-validator';
+import { useRequest } from 'alova/client';
 import { ValidatedTextField } from 'components';
+import { toast } from 'components/toast';
 import { useI18nContext } from 'i18n/i18n-react';
 import { numberValue, updateValue } from 'utils';
 import { ValidationError, validate } from 'validators';
+import type Schema from 'validators/schema';
+import type { ValidateFieldsError } from 'validators/schema';

-import { DeviceValueUOM, DeviceValueUOM_s } from './types';
+import { DeviceValueUOM, DeviceValueUOM_s, getDeviceValueKind } from './types';
 import type { DeviceValue } from './types';

 interface DevicesDialogProps {
@@ -52,7 +56,7 @@ const DevicesDialog = ({
  const [editItem, setEditItem] = useState<DeviceValue>(selectedItem);
  const [fieldErrors, setFieldErrors] = useState<ValidateFieldsError>();

-  const updateFormValue = useMemo(() => updateValue(setEditItem), [setEditItem]);
+  const updateFormValue = updateValue(setEditItem);

  useEffect(() => {
    if (open) {
@@ -61,36 +65,48 @@ const DevicesDialog = ({
    }
  }, [open, selectedItem]);

-  const save = useCallback(async () => {
+  const { send: executeCommand } = useRequest(
+    (id: string) => callAction({ action: 'executeCommand', param: id }),
+    { immediate: false }
+  )
+    .onSuccess(() => {
+      toast.success(LL.COMMAND_EXECUTED());
+    })
+    .onError((error) => {
+      toast.error(String(error.error?.message || 'An error occurred'));
+    });
+
+  const doAction = async () => {
    try {
      setFieldErrors(undefined);
-      await validate(validator, editItem);
+      if (editItem.v === undefined && editItem.c !== undefined) {
+        await executeCommand(editItem.c);
+      } else {
+        await validate(validator, editItem);
+      }
      onSave(editItem);
    } catch (error) {
      setFieldErrors((error as ValidationError).fieldErrors);
    }
-  }, [validator, editItem, onSave]);
+  };

-  const setUom = useCallback(
-    (uom?: DeviceValueUOM) => {
-      if (uom === undefined) {
-        return;
-      }
-      switch (uom) {
-        case DeviceValueUOM.HOURS:
-          return LL.HOURS();
-        case DeviceValueUOM.MINUTES:
-          return LL.MINUTES();
-        case DeviceValueUOM.SECONDS:
-          return LL.SECONDS();
-        default:
-          return DeviceValueUOM_s[uom];
-      }
-    },
-    [LL]
-  );
+  const setUom = (uom?: DeviceValueUOM) => {
+    if (uom === undefined) {
+      return;
+    }
+    switch (uom) {
+      case DeviceValueUOM.HOURS:
+        return LL.HOURS();
+      case DeviceValueUOM.MINUTES:
+        return LL.MINUTES();
+      case DeviceValueUOM.SECONDS:
+        return LL.SECONDS();
+      default:
+        return DeviceValueUOM_s[uom];
+    }
+  };

-  const showHelperText = useCallback((dv: DeviceValue) => {
+  const showHelperText = (dv: DeviceValue) => {
    if (dv.h) return dv.h;
    if (dv.l) return dv.l.join(' | ');
    if (dv.m !== undefined && dv.x !== undefined) {
@@ -101,26 +117,23 @@ const DevicesDialog = ({
      );
    }
    return undefined;
-  }, []);
+  };

-  const isCommand = useMemo(
-    () => selectedItem.v === '' && selectedItem.c,
-    [selectedItem.v, selectedItem.c]
-  );
+  const kind = getDeviceValueKind(selectedItem);

-  const dialogTitle = useMemo(() => {
-    if (isCommand) return LL.RUN_COMMAND();
-    return writeable ? LL.CHANGE_VALUE() : LL.VALUE(0);
-  }, [isCommand, writeable, LL]);
+  const dialogTitle =
+    kind === 'command' || kind === 'deviceCommand'
+      ? LL.RUN() + ' ' + LL.COMMAND(0)
+      : kind === 'scheduler'
+        ? LL.UPDATE() + ' ' + LL.SCHEDULE(0)
+        : writeable
+          ? LL.CHANGE_VALUE()
+          : LL.VALUE(0);

-  const buttonLabel = useMemo(() => {
-    return isCommand ? LL.EXECUTE() : LL.UPDATE();
-  }, [isCommand, LL]);
+  const buttonLabel =
+    kind === 'command' || kind === 'deviceCommand' ? LL.RUN() : LL.UPDATE();

-  const helperText = useMemo(
-    () => showHelperText(editItem),
-    [editItem, showHelperText]
-  );
+  const helperText = showHelperText(editItem);

  const valueLabel = LL.VALUE(0);

@@ -131,67 +144,69 @@ const DevicesDialog = ({
        <Typography sx={{ mb: 2 }} color="warning" variant="body2">
          {editItem.id.slice(2)}
        </Typography>
-        <Grid container>
-          <Grid size={12}>
-            {editItem.l ? (
-              <TextField
-                name="v"
-                value={editItem.v}
-                aria-label={valueLabel}
-                disabled={!writeable}
-                sx={{ width: '30ch' }}
-                select
-                onChange={updateFormValue}
-              >
-                {editItem.l.map((val) => (
-                  <MenuItem value={val} key={val}>
-                    {val}
-                  </MenuItem>
-                ))}
-              </TextField>
-            ) : editItem.s || editItem.u !== DeviceValueUOM.NONE ? (
-              <ValidatedTextField
-                fieldErrors={fieldErrors || {}}
-                name="v"
-                label={valueLabel}
-                value={numberValue(Math.round((editItem.v as number) * 10) / 10)}
-                autoFocus
-                disabled={!writeable}
-                type="number"
-                sx={{ width: '30ch' }}
-                onChange={updateFormValue}
-                slotProps={{
-                  htmlInput: editItem.s
-                    ? { min: editItem.m, max: editItem.x, step: editItem.s }
-                    : {},
-                  input: {
-                    startAdornment: (
-                      <InputAdornment position="start">
-                        {setUom(editItem.u)}
-                      </InputAdornment>
-                    )
-                  }
-                }}
-              />
-            ) : (
-              <ValidatedTextField
-                fieldErrors={fieldErrors || {}}
-                name="v"
-                label={valueLabel}
-                value={editItem.v}
-                disabled={!writeable}
-                sx={{ width: '30ch' }}
-                multiline={!editItem.u}
-                onChange={updateFormValue}
-              />
+        {kind !== 'command' && (
+          <Grid container>
+            <Grid size={12}>
+              {editItem.l ? (
+                <TextField
+                  name="v"
+                  value={editItem.v}
+                  aria-label={valueLabel}
+                  disabled={!writeable}
+                  sx={{ width: '30ch' }}
+                  select
+                  onChange={updateFormValue}
+                >
+                  {editItem.l.map((val) => (
+                    <MenuItem value={val} key={val}>
+                      {val}
+                    </MenuItem>
+                  ))}
+                </TextField>
+              ) : editItem.s || editItem.u !== DeviceValueUOM.NONE ? (
+                <ValidatedTextField
+                  fieldErrors={fieldErrors || {}}
+                  name="v"
+                  label={valueLabel}
+                  value={numberValue(Math.round((editItem.v as number) * 10) / 10)}
+                  autoFocus
+                  disabled={!writeable}
+                  type="number"
+                  sx={{ width: '30ch' }}
+                  onChange={updateFormValue}
+                  slotProps={{
+                    htmlInput: editItem.s
+                      ? { min: editItem.m, max: editItem.x, step: editItem.s }
+                      : {},
+                    input: {
+                      startAdornment: (
+                        <InputAdornment position="start">
+                          {setUom(editItem.u)}
+                        </InputAdornment>
+                      )
+                    }
+                  }}
+                />
+              ) : (
+                <ValidatedTextField
+                  fieldErrors={fieldErrors || {}}
+                  name="v"
+                  label={valueLabel}
+                  value={editItem.v}
+                  disabled={!writeable}
+                  sx={{ width: '30ch' }}
+                  multiline={!editItem.u}
+                  onChange={updateFormValue}
+                />
+              )}
+            </Grid>
+            {writeable && helperText && (
+              <Grid>
+                <FormHelperText>{helperText}</FormHelperText>
+              </Grid>
            )}
          </Grid>
-          {writeable && helperText && (
-            <Grid>
-              <FormHelperText>{helperText}</FormHelperText>
-            </Grid>
-          )}
-        </Grid>
+        )}
      </DialogContent>

      <DialogActions>
@@ -213,10 +228,16 @@ const DevicesDialog = ({
              {LL.CANCEL()}
            </Button>
            <Button
-              startIcon={<WarningIcon color="warning" />}
+              startIcon={
+                kind === 'command' ? (
+                  <PlayArrowIcon />
+                ) : kind === 'deviceEntity' || kind === 'deviceCommand' ? (
+                  <WarningIcon color="warning" />
+                ) : undefined
+              }
              variant="outlined"
-              onClick={save}
-              color="primary"
+              onClick={doAction}
+              color={kind !== 'value' ? 'success' : 'primary'}
            >
              {buttonLabel}
            </Button>
@@ -1,5 +1,3 @@
-import { useCallback, useMemo } from 'react';
-
 import { ToggleButton, ToggleButtonGroup } from '@mui/material';

 import OptionIcon from './OptionIcon';
@@ -11,7 +9,6 @@ interface EntityMaskToggleProps {
  de: DeviceEntity;
 }

-// Available mask values
 const MASK_VALUES = [
  DeviceEntityMask.DV_WEB_EXCLUDE, // 1
  DeviceEntityMask.DV_API_MQTT_EXCLUDE, // 2
@@ -20,123 +17,95 @@ const MASK_VALUES = [
  DeviceEntityMask.DV_DELETED // 128
 ];

-/**
- * Converts an array of mask strings to a bitmask number
- */
-const getMaskNumber = (newMask: string[]): number => {
-  return newMask.reduce((mask, entry) => mask | Number(entry), 0);
-};
+const getMaskNumber = (newMask: string[]): number =>
+  newMask.reduce((mask, entry) => mask | Number(entry), 0);

-/**
- * Converts a bitmask number to an array of mask strings
- */
-const getMaskString = (mask: number): string[] => {
-  return MASK_VALUES.filter((value) => (mask & value) === value).map((value) =>
+const getMaskString = (mask: number): string[] =>
+  MASK_VALUES.filter((value) => (mask & value) === value).map((value) =>
    String(value)
  );
-};

-/**
- * Checks if a specific mask bit is set
- */
 const hasMask = (mask: number, flag: number): boolean => (mask & flag) === flag;

 const EntityMaskToggle = ({ onUpdate, de }: EntityMaskToggleProps) => {
-  const handleChange = useCallback(
-    (_event: unknown, mask: string[]) => {
-      // Convert selected masks to a number
-      const newMask = getMaskNumber(mask);
-      const updatedDe = { ...de };
+  const handleChange = (_event: unknown, mask: string[]) => {
+    const newMask = getMaskNumber(mask);
+    const updatedDe = { ...de };

-      // Apply business logic for mask interactions
-      // If entity has no name and is set to readonly, also exclude from web
-      if (updatedDe.n === '' && hasMask(newMask, DeviceEntityMask.DV_READONLY)) {
-        updatedDe.m = newMask | DeviceEntityMask.DV_WEB_EXCLUDE;
-      } else {
-        updatedDe.m = newMask;
-      }
+    // If entity has no name and is set to readonly, also exclude from web
+    if (updatedDe.n === '' && hasMask(newMask, DeviceEntityMask.DV_READONLY)) {
+      updatedDe.m = newMask | DeviceEntityMask.DV_WEB_EXCLUDE;
+    } else {
+      updatedDe.m = newMask;
+    }

-      // If excluded from web, cannot be favorite
-      if (hasMask(updatedDe.m, DeviceEntityMask.DV_WEB_EXCLUDE)) {
-        updatedDe.m = updatedDe.m & ~DeviceEntityMask.DV_FAVORITE;
-      }
+    // If excluded from web, cannot be favorite
+    if (hasMask(updatedDe.m, DeviceEntityMask.DV_WEB_EXCLUDE)) {
+      updatedDe.m = updatedDe.m & ~DeviceEntityMask.DV_FAVORITE;
+    }

-      onUpdate(updatedDe);
-    },
-    [de, onUpdate]
-  );
-
-  // Memoize mask string value
-  const maskStringValue = useMemo(() => getMaskString(de.m), [de.m]);
-
-  // Memoize disabled states
-  const isFavoriteDisabled = useMemo(
-    () =>
-      hasMask(de.m, DeviceEntityMask.DV_WEB_EXCLUDE | DeviceEntityMask.DV_DELETED) ||
-      de.n === undefined,
-    [de.m, de.n]
-  );
-
-  const isReadonlyDisabled = useMemo(
-    () =>
-      !de.w ||
-      hasMask(de.m, DeviceEntityMask.DV_WEB_EXCLUDE | DeviceEntityMask.DV_FAVORITE),
-    [de.w, de.m]
-  );
-
-  const isApiMqttExcludeDisabled = useMemo(
-    () => de.n === '' || hasMask(de.m, DeviceEntityMask.DV_DELETED),
-    [de.n, de.m]
-  );
-
-  const isWebExcludeDisabled = useMemo(
-    () => de.n === undefined || hasMask(de.m, DeviceEntityMask.DV_DELETED),
-    [de.n, de.m]
-  );
-
-  // Memoize mask flag checks
-  const isFavoriteSet = useMemo(
-    () => hasMask(de.m, DeviceEntityMask.DV_FAVORITE),
-    [de.m]
-  );
-  const isReadonlySet = useMemo(
-    () => hasMask(de.m, DeviceEntityMask.DV_READONLY),
-    [de.m]
-  );
-  const isApiMqttExcludeSet = useMemo(
-    () => hasMask(de.m, DeviceEntityMask.DV_API_MQTT_EXCLUDE),
-    [de.m]
-  );
-  const isWebExcludeSet = useMemo(
-    () => hasMask(de.m, DeviceEntityMask.DV_WEB_EXCLUDE),
-    [de.m]
-  );
-  const isDeletedSet = useMemo(
-    () => hasMask(de.m, DeviceEntityMask.DV_DELETED),
-    [de.m]
-  );
+    onUpdate(updatedDe);
+  };

  return (
    <ToggleButtonGroup
      size="small"
      color="secondary"
-      value={maskStringValue}
+      value={getMaskString(de.m)}
      onChange={handleChange}
    >
-      <ToggleButton value="8" disabled={isFavoriteDisabled}>
-        <OptionIcon type="favorite" isSet={isFavoriteSet} />
+      <ToggleButton
+        value="8"
+        disabled={
+          hasMask(
+            de.m,
+            DeviceEntityMask.DV_WEB_EXCLUDE | DeviceEntityMask.DV_DELETED
+          ) || de.n === undefined
+        }
+      >
+        <OptionIcon
+          type="favorite"
+          isSet={hasMask(de.m, DeviceEntityMask.DV_FAVORITE)}
+        />
      </ToggleButton>
-      <ToggleButton value="4" disabled={isReadonlyDisabled}>
-        <OptionIcon type="readonly" isSet={isReadonlySet} />
+      <ToggleButton
+        value="4"
+        disabled={
+          !de.w ||
+          hasMask(
+            de.m,
+            DeviceEntityMask.DV_WEB_EXCLUDE | DeviceEntityMask.DV_FAVORITE
+          )
+        }
+      >
+        <OptionIcon
+          type="readonly"
+          isSet={hasMask(de.m, DeviceEntityMask.DV_READONLY)}
+        />
      </ToggleButton>
-      <ToggleButton value="2" disabled={isApiMqttExcludeDisabled}>
-        <OptionIcon type="api_mqtt_exclude" isSet={isApiMqttExcludeSet} />
+      <ToggleButton
+        value="2"
+        disabled={de.n === '' || hasMask(de.m, DeviceEntityMask.DV_DELETED)}
+      >
+        <OptionIcon
+          type="api_mqtt_exclude"
+          isSet={hasMask(de.m, DeviceEntityMask.DV_API_MQTT_EXCLUDE)}
+        />
      </ToggleButton>
-      <ToggleButton value="1" disabled={isWebExcludeDisabled}>
-        <OptionIcon type="web_exclude" isSet={isWebExcludeSet} />
+      <ToggleButton
+        value="1"
+        disabled={de.n === undefined || hasMask(de.m, DeviceEntityMask.DV_DELETED)}
+      >
+        <OptionIcon
+          type="web_exclude"
+          isSet={hasMask(de.m, DeviceEntityMask.DV_WEB_EXCLUDE)}
+        />
      </ToggleButton>
      <ToggleButton value="128">
-        <OptionIcon type="deleted" isSet={isDeletedSet} />
+        <OptionIcon
+          type="deleted"
+          isSet={hasMask(de.m, DeviceEntityMask.DV_DELETED)}
+        />
      </ToggleButton>
    </ToggleButtonGroup>
  );
@@ -1,6 +1,5 @@
-import { memo, useCallback, useContext, useMemo, useState } from 'react';
+import { memo, useContext, useState } from 'react';
 import type { ReactElement } from 'react';
-import { toast } from 'react-toastify';

 import CommentIcon from '@mui/icons-material/CommentTwoTone';
 import DownloadIcon from '@mui/icons-material/GetApp';
@@ -25,6 +24,7 @@ import type { SxProps, Theme } from '@mui/material/styles';

 import { useRequest } from 'alova/client';
 import { SectionContent, useLayoutTitle } from 'components';
+import { toast } from 'components/toast';
 import { AuthenticatedContext } from 'contexts/authentication';
 import { useI18nContext } from 'i18n/i18n-react';
 import { saveFile } from 'utils';
@@ -60,6 +60,8 @@ const AVATAR_STYLES: SxProps<Theme> = {
  bgcolor: '#72caf9'
 };

+const SYSTEM_INFO_API: APIcall = { device: 'system', cmd: 'info', id: 0 };
+
 const HelpComponent = () => {
  const { LL } = useI18nContext();
  useLayoutTitle(LL.HELP());
@@ -72,12 +74,7 @@ const HelpComponent = () => {
  });
  const [imgError, setImgError] = useState<boolean>(false);

-  const getCustomSupportMethod = useMemo(
-    () => callAction({ action: 'getCustomSupport' }),
-    []
-  );
-
-  useRequest(getCustomSupportMethod).onSuccess((event) => {
+  useRequest(callAction({ action: 'getCustomSupport' })).onSuccess((event) => {
    if (event?.data && Object.keys(event.data).length !== 0) {
      const { Support } = event.data as {
        Support: { img_url?: string; html?: string[] };
@@ -100,47 +97,26 @@ const HelpComponent = () => {
      toast.error(String(error.error?.message || 'An error occurred'));
    });

-  // Optimize API call memoization
-  const apiCall = useMemo(() => ({ device: 'system', cmd: 'info', id: 0 }), []);
+  const helpLinks: HelpLink[] = [
+    {
+      href: 'https://emsesp.org',
+      icon: <MenuBookIcon />,
+      label: () => LL.HELP_INFORMATION_1()
+    },
+    {
+      href: 'https://discord.gg/GP9DPSgeJq',
+      icon: <CommentIcon />,
+      label: () => LL.HELP_INFORMATION_2()
+    },
+    {
+      href: 'https://github.com/emsesp/EMS-ESP32/issues/new/choose',
+      icon: <GitHubIcon />,
+      label: () => LL.HELP_INFORMATION_3()
+    }
+  ];

-  const handleDownloadSystemInfo = useCallback(() => {
-    void sendAPI(apiCall);
-  }, [sendAPI, apiCall]);
-
-  const handleImageError = useCallback(() => {
-    setImgError(true);
-  }, []);
-
-  // Memoize help links to prevent recreation on every render
-  const helpLinks: HelpLink[] = useMemo(
-    () => [
-      {
-        href: 'https://emsesp.org',
-        icon: <MenuBookIcon />,
-        label: () => LL.HELP_INFORMATION_1()
-      },
-      {
-        href: 'https://discord.gg/GP9DPSgeJq',
-        icon: <CommentIcon />,
-        label: () => LL.HELP_INFORMATION_2()
-      },
-      {
-        href: 'https://github.com/emsesp/EMS-ESP32/issues/new/choose',
-        icon: <GitHubIcon />,
-        label: () => LL.HELP_INFORMATION_3()
-      }
-    ],
-    [LL]
-  );
-
-  const isAdmin = useMemo(() => me?.admin ?? false, [me?.admin]);
-
-  // Memoize image source computation
-  const imageSrc = useMemo(
-    () =>
-      imgError || !customSupport.img_url ? DEFAULT_IMAGE_URL : customSupport.img_url,
-    [imgError, customSupport.img_url]
-  );
+  const imageSrc =
+    imgError || !customSupport.img_url ? DEFAULT_IMAGE_URL : customSupport.img_url;

  return (
    <SectionContent>
@@ -157,13 +133,13 @@ const HelpComponent = () => {
            component="img"
            referrerPolicy="no-referrer"
            sx={IMAGE_STYLES}
-            onError={handleImageError}
+            onError={() => setImgError(true)}
            src={imageSrc}
          />
        </Stack>
      )}

-      {isAdmin && (
+      {me?.admin && (
        <List>
          {helpLinks.map(({ href, icon, label }) => (
            <ListItem key={href}>
@@ -191,7 +167,7 @@ const HelpComponent = () => {
          startIcon={<DownloadIcon />}
          variant="outlined"
          color="primary"
-          onClick={handleDownloadSystemInfo}
+          onClick={() => void sendAPI(SYSTEM_INFO_API)}
        >
          {LL.SUPPORT_INFORMATION(0)}
        </Button>
@@ -214,7 +190,6 @@ const HelpComponent = () => {
  );
 };

-// Memoize the component to prevent unnecessary re-renders
 const Help = memo(HelpComponent);

 export default Help;
@@ -1,6 +1,5 @@
-import { memo, useCallback, useMemo, useState } from 'react';
+import { memo, useState } from 'react';
 import { useBlocker } from 'react-router';
-import { toast } from 'react-toastify';

 import CancelIcon from '@mui/icons-material/Cancel';
 import CircleIcon from '@mui/icons-material/Circle';
@@ -25,6 +24,7 @@ import {
  SectionContent,
  useLayoutTitle
 } from 'components';
+import { toast } from 'components/toast';
 import { useI18nContext } from 'i18n/i18n-react';

 import { readModules, writeModules } from '../../api/app';
@@ -69,58 +69,53 @@ const Modules = () => {
    }
  );

-  const modules_theme = useTheme(
-    useMemo(
-      () => ({
-        Table: `
-          --data-table-library_grid-template-columns: 48px 180px 120px 100px repeat(1, minmax(160px, 1fr)) 180px;
-        `,
-        BaseRow: `
-          font-size: 14px;
-          .td {
-            height: 32px;
-          }
-        `,
-        BaseCell: `
-          &:nth-of-type(1) {
-            text-align: center;
-          }
-        `,
-        HeaderRow: `
-          text-transform: uppercase;
-          background-color: black;
-          color: #90CAF9;
-          .th {
-            border-bottom: 1px solid #565656;
-            height: 36px;
-          }
-        `,
-        Row: `
-          background-color: #1e1e1e;
-          position: relative;
-          cursor: pointer;
-          .td {
-            border-top: 1px solid #565656;
-            border-bottom: 1px solid #565656;
-          }
-          &:hover .td {
-            border-top: 1px solid #177ac9;
-            border-bottom: 1px solid #177ac9;
-          }
-          &:nth-of-type(odd) .td {
-            background-color: #303030;
-          }
-        `
-      }),
-      []
-    )
-  );
+  const modules_theme = useTheme({
+    Table: `
+      --data-table-library_grid-template-columns: 48px 180px 120px 100px repeat(1, minmax(160px, 1fr)) 180px;
+    `,
+    BaseRow: `
+      font-size: 14px;
+      .td {
+        height: 32px;
+      }
+    `,
+    BaseCell: `
+      &:nth-of-type(1) {
+        text-align: center;
+      }
+    `,
+    HeaderRow: `
+      text-transform: uppercase;
+      background-color: black;
+      color: #90CAF9;
+      .th {
+        border-bottom: 1px solid #565656;
+        height: 36px;
+      }
+    `,
+    Row: `
+      background-color: #1e1e1e;
+      position: relative;
+      cursor: pointer;
+      .td {
+        border-top: 1px solid #565656;
+        border-bottom: 1px solid #565656;
+      }
+      &:hover .td {
+        border-top: 1px solid #177ac9;
+        border-bottom: 1px solid #177ac9;
+      }
+      &:nth-of-type(odd) .td {
+        background-color: #303030;
+      }
+    `
+  });

-  const onDialogClose = useCallback(() => {
+  const onDialogClose = () => {
    setDialogOpen(false);
-  }, []);
+  };

-  const updateModuleItem = useCallback((updatedItem: ModuleItem) => {
+  const updateModuleItem = (updatedItem: ModuleItem) => {
    void updateState(readModules(), (data: ModuleItem[]) => {
      const new_data = data.map((mi) =>
        mi.id === updatedItem.id ? { ...mi, ...updatedItem } : mi
@@ -128,28 +123,25 @@ const Modules = () => {
      setNumChanges(new_data.filter(hasModulesChanged).length);
      return new_data;
    });
-  }, []);
+  };

-  const onDialogSave = useCallback(
-    (updatedItem: ModuleItem) => {
-      setDialogOpen(false);
-      updateModuleItem(updatedItem);
-    },
-    [updateModuleItem]
-  );
+  const onDialogSave = (updatedItem: ModuleItem) => {
+    setDialogOpen(false);
+    updateModuleItem(updatedItem);
+  };

-  const editModuleItem = useCallback((mi: ModuleItem) => {
+  const editModuleItem = (mi: ModuleItem) => {
    setSelectedModuleItem(mi);
    setDialogOpen(true);
-  }, []);
+  };

-  const onCancel = useCallback(async () => {
+  const onCancel = async () => {
    await fetchModules().then(() => {
      setNumChanges(0);
    });
-  }, [fetchModules]);
+  };

-  const saveModules = useCallback(async () => {
+  const saveModules = async () => {
    try {
      await Promise.all(
        modules.map((condensed_mi: ModuleItem) =>
@@ -167,9 +159,9 @@ const Modules = () => {
      await fetchModules();
      setNumChanges(0);
    }
-  }, [modules, updateModules, LL, fetchModules]);
+  };

-  const content = useMemo(() => {
+  const renderContent = () => {
    if (!modules) {
      return (
        <FormLoader onRetry={fetchModules} errorMessage={error?.message || ''} />
@@ -262,22 +254,12 @@ const Modules = () => {
        </Box>
      </>
    );
-  }, [
-    modules,
-    fetchModules,
-    error,
-    modules_theme,
-    editModuleItem,
-    LL,
-    numChanges,
-    onCancel,
-    saveModules
-  ]);
+  };

  return (
    <SectionContent>
      {blocker ? <BlockNavigation blocker={blocker} /> : null}
-      {content}
+      {renderContent()}
      {selectedModuleItem && (
        <ModulesDialog
          open={dialogOpen}
@@ -1,4 +1,4 @@
-import { useCallback, useEffect, useMemo, useState } from 'react';
+import { useEffect, useState } from 'react';

 import CancelIcon from '@mui/icons-material/Cancel';
 import DoneIcon from '@mui/icons-material/Done';
@@ -37,14 +37,10 @@ const ModulesDialog = ({
  const { LL } = useI18nContext();
  const [editItem, setEditItem] = useState<ModuleItem>(selectedItem);

-  const updateFormValue = useMemo(
-    () =>
-      updateValue(
-        setEditItem as unknown as React.Dispatch<
-          React.SetStateAction<Record<string, unknown>>
-        >
-      ),
-    []
+  const updateFormValue = updateValue(
+    setEditItem as unknown as React.Dispatch<
+      React.SetStateAction<Record<string, unknown>>
+    >
  );

  // Sync form state when dialog opens or selected item changes
@@ -54,18 +50,13 @@ const ModulesDialog = ({
    }
  }, [open, selectedItem]);

-  const handleSave = useCallback(() => {
+  const handleSave = () => {
    onSave(editItem);
-  }, [editItem, onSave]);
-
-  const dialogTitle = useMemo(
-    () => `${LL.EDIT()} ${editItem.key}`,
-    [LL, editItem.key]
-  );
+  };

  return (
    <Dialog sx={dialogStyle} fullWidth maxWidth="xs" open={open} onClose={onClose}>
-      <DialogTitle>{dialogTitle}</DialogTitle>
+      <DialogTitle>{`${LL.EDIT()} ${editItem.key}`}</DialogTitle>
      <DialogContent dividers>
        <Grid container>
          <BlockFormControlLabel
@@ -1,6 +1,5 @@
-import { useCallback, useEffect, useMemo, useState } from 'react';
+import { useEffect, useState } from 'react';
 import { useBlocker } from 'react-router';
-import { toast } from 'react-toastify';

 import AddIcon from '@mui/icons-material/Add';
 import CancelIcon from '@mui/icons-material/Cancel';
@@ -26,10 +25,11 @@ import {
  SectionContent,
  useLayoutTitle
 } from 'components';
+import { toast } from 'components/toast';
 import { useI18nContext } from 'i18n/i18n-react';
 import { useInterval } from 'utils';

-import { readSchedule, writeSchedule } from '../../api/app';
+import { readCommands, readSchedule, writeSchedule } from '../../api/app';
 import SettingsSchedulerDialog from './SchedulerDialog';
 import { ScheduleFlag } from './types';
 import type { Schedule, ScheduleItem } from './types';
@@ -54,14 +54,13 @@ const DEFAULT_SCHEDULE_ITEM: Omit<ScheduleItem, 'id' | 'o_id'> = {
  deleted: false,
  flags: FLAG_ALL_DAYS,
  time: '',
-  cmd: '',
-  value: '',
+  cmd_name: '',
  name: ''
 };

 const scheduleTheme = {
  Table: `
-    --data-table-library_grid-template-columns: 36px 210px 100px 192px repeat(1, minmax(100px, 1fr)) 160px;
+    --data-table-library_grid-template-columns: 36px 220px repeat(1, minmax(20px, 1fr)) 192px 160px;
  `,
  BaseRow: `
    font-size: 14px;
@@ -70,11 +69,8 @@ const scheduleTheme = {
    }
  `,
  BaseCell: `
-    &:nth-of-type(2) {
-      text-align: center;
-    }
    &:nth-of-type(1) {
-      text-align: center;
+      text-align: 8px;
    }
  `,
  HeaderRow: `
@@ -100,7 +96,6 @@ const scheduleTheme = {
 };

 const scheduleTypeLabels: Record<number, string> = {
-  [ScheduleFlag.SCHEDULE_IMMEDIATE]: 'Immediate',
  [ScheduleFlag.SCHEDULE_TIMER]: 'Timer',
  [ScheduleFlag.SCHEDULE_CONDITION]: 'Condition',
  [ScheduleFlag.SCHEDULE_ONCHANGE]: 'On Change'
@@ -125,6 +120,11 @@ const Scheduler = () => {
    initialData: []
  });

+  const { data: commandNames } = useRequest(readCommands, {
+    initialData: [],
+    initializing: true
+  });
+
  const { send: updateSchedule } = useRequest(
    (data: Schedule) => writeSchedule(data),
    {
@@ -132,7 +132,7 @@ const Scheduler = () => {
    }
  );

-  const hasScheduleChanged = useCallback((si: ScheduleItem) => {
+  const hasScheduleChanged = (si: ScheduleItem) => {
    return (
      si.id !== si.o_id ||
      (si.name || '') !== (si.o_name || '') ||
@@ -140,18 +140,15 @@ const Scheduler = () => {
      si.deleted !== si.o_deleted ||
      si.flags !== si.o_flags ||
      si.time !== si.o_time ||
-      si.cmd !== si.o_cmd ||
-      si.value !== si.o_value
+      si.cmd_name !== si.o_cmd_name
    );
-  }, []);
+  };

-  const intervalCallback = useCallback(() => {
+  useInterval(() => {
    if (numChanges === 0) {
      void fetchSchedule();
    }
-  }, [numChanges, fetchSchedule]);
-
-  useInterval(intervalCallback, INTERVAL_DELAY);
+  }, INTERVAL_DELAY);

  useEffect(() => {
    const formatter = new Intl.DateTimeFormat(locale, {
@@ -169,7 +166,7 @@ const Scheduler = () => {

  const schedule_theme = useTheme(scheduleTheme);

-  const saveSchedule = useCallback(async () => {
+  const saveSchedule = async () => {
    try {
      await updateSchedule({
        schedule: schedule
@@ -179,8 +176,7 @@ const Scheduler = () => {
            active: condensed_si.active,
            flags: condensed_si.flags,
            time: condensed_si.time,
-            cmd: condensed_si.cmd,
-            value: condensed_si.value,
+            cmd_name: condensed_si.cmd_name,
            name: condensed_si.name
          }))
      });
@@ -192,46 +188,43 @@ const Scheduler = () => {
      await fetchSchedule();
      setNumChanges(0);
    }
-  }, [LL, schedule, updateSchedule, fetchSchedule]);
+  };

-  const editScheduleItem = useCallback((si: ScheduleItem) => {
+  const editScheduleItem = (si: ScheduleItem) => {
    setCreating(false);
    setSelectedScheduleItem(si);
    setDialogOpen(true);
    if (si.o_name === undefined) {
      si.o_name = si.name;
    }
-  }, []);
+  };

-  const onDialogClose = useCallback(() => {
+  const onDialogClose = () => {
    setDialogOpen(false);
-  }, []);
+  };

-  const onDialogCancel = useCallback(async () => {
+  const onDialogCancel = async () => {
    await fetchSchedule().then(() => {
      setNumChanges(0);
    });
-  }, [fetchSchedule]);
+  };

-  const onDialogSave = useCallback(
-    (updatedItem: ScheduleItem) => {
-      setDialogOpen(false);
-      void updateState(readSchedule(), (data: ScheduleItem[]) => {
-        const new_data = creating
-          ? [...data, updatedItem]
-          : data.map((si) =>
-              si.id === updatedItem.id ? { ...si, ...updatedItem } : si
-            );
+  const onDialogSave = (updatedItem: ScheduleItem) => {
+    setDialogOpen(false);
+    void updateState(readSchedule(), (data: ScheduleItem[]) => {
+      const new_data = creating
+        ? [...data, updatedItem]
+        : data.map((si) =>
+            si.id === updatedItem.id ? { ...si, ...updatedItem } : si
+          );

-        setNumChanges(new_data.filter((si) => hasScheduleChanged(si)).length);
+      setNumChanges(new_data.filter((si) => hasScheduleChanged(si)).length);

-        return new_data;
-      });
-    },
-    [creating, hasScheduleChanged]
-  );
+      return new_data;
+    });
+  };

-  const addScheduleItem = useCallback(() => {
+  const addScheduleItem = () => {
    setCreating(true);
    const newItem: ScheduleItem = {
      id: Math.floor(Math.random() * (MAX_ID - MIN_ID) + MIN_ID),
@@ -239,36 +232,29 @@ const Scheduler = () => {
    };
    setSelectedScheduleItem(newItem);
    setDialogOpen(true);
-  }, []);
+  };

-  const filteredAndSortedSchedule = useMemo(
-    () =>
-      schedule
-        .filter((si: ScheduleItem) => !si.deleted)
-        .sort((a: ScheduleItem, b: ScheduleItem) => a.flags - b.flags),
-    [schedule]
-  );
+  const filteredAndSortedSchedule = schedule
+    .filter((si: ScheduleItem) => !si.deleted)
+    .sort((a: ScheduleItem, b: ScheduleItem) => a.flags - b.flags);

-  const dayBox = useCallback(
-    (si: ScheduleItem, flag: number) => {
-      const dayIndex = Math.log(flag) / LOG_2;
-      const isActive = (si.flags & flag) === flag;
+  const dayBox = (si: ScheduleItem, flag: number, isLast = false) => {
+    const dayIndex = Math.log(flag) / LOG_2;
+    const isActive = (si.flags & flag) === flag;

-      return (
-        <>
-          <Box>
-            <Typography sx={{ fontSize: 11 }} color={isActive ? 'primary' : 'grey'}>
-              {dow[dayIndex]}
-            </Typography>
-          </Box>
-          <Divider orientation="vertical" flexItem />
-        </>
-      );
-    },
-    [dow]
-  );
+    return (
+      <>
+        <Box>
+          <Typography sx={{ fontSize: 11 }} color={isActive ? 'primary' : 'grey'}>
+            {dow[dayIndex]}
+          </Typography>
+        </Box>
+        {!isLast && <Divider orientation="vertical" flexItem />}
+      </>
+    );
+  };

-  const scheduleType = useCallback((si: ScheduleItem) => {
+  const scheduleType = (si: ScheduleItem) => {
    const label = scheduleTypeLabels[si.flags];

    return (
@@ -278,9 +264,9 @@ const Scheduler = () => {
        </Typography>
      </Box>
    );
-  }, []);
+  };

-  const renderSchedule = useCallback(() => {
+  const renderSchedule = () => {
    if (!schedule) {
      return (
        <FormLoader onRetry={fetchSchedule} errorMessage={error?.message || ''} />
@@ -299,9 +285,10 @@ const Scheduler = () => {
              <HeaderRow>
                <HeaderCell />
                <HeaderCell stiff>{LL.SCHEDULE(0)}</HeaderCell>
-                <HeaderCell stiff>{LL.TIME(0)}/Cond.</HeaderCell>
+                <HeaderCell stiff>
+                  {LL.TIME(0)}/{LL.CONDITION()}
+                </HeaderCell>
                <HeaderCell stiff>{LL.COMMAND(0)}</HeaderCell>
-                <HeaderCell stiff>{LL.VALUE(0)}</HeaderCell>
                <HeaderCell stiff>{LL.NAME(0)}</HeaderCell>
              </HeaderRow>
            </Header>
@@ -311,12 +298,16 @@ const Scheduler = () => {
                  <Cell stiff>
                    <CircleIcon
                      color={si.active ? 'success' : 'error'}
-                      sx={{ fontSize: ICON_SIZE, verticalAlign: 'middle' }}
+                      sx={{
+                        fontSize: ICON_SIZE,
+                        ml: '4px',
+                        position: 'relative',
+                        top: '2px'
+                      }}
                    />
                  </Cell>
                  <Cell stiff>
                    <Stack spacing={0.5} direction="row">
-                      <Divider orientation="vertical" flexItem />
                      {si.flags > SCHEDULE_FLAG_THRESHOLD ? (
                        scheduleType(si)
                      ) : (
@@ -327,14 +318,13 @@ const Scheduler = () => {
                          {dayBox(si, ScheduleFlag.SCHEDULE_THU)}
                          {dayBox(si, ScheduleFlag.SCHEDULE_FRI)}
                          {dayBox(si, ScheduleFlag.SCHEDULE_SAT)}
-                          {dayBox(si, ScheduleFlag.SCHEDULE_SUN)}
+                          {dayBox(si, ScheduleFlag.SCHEDULE_SUN, true)}
                        </>
                      )}
                    </Stack>
                  </Cell>
-                  <Cell>{si.time}</Cell>
-                  <Cell>{si.cmd}</Cell>
-                  <Cell>{si.value}</Cell>
+                  <Cell>{si.time === '' ? LL.SCHEDULER_HELP_2() : si.time}</Cell>
+                  <Cell>{si.cmd_name}</Cell>
                  <Cell>{si.name}</Cell>
                </Row>
              ))}
@@ -343,17 +333,7 @@ const Scheduler = () => {
        )}
      </Table>
    );
-  }, [
-    schedule,
-    error,
-    fetchSchedule,
-    filteredAndSortedSchedule,
-    schedule_theme,
-    editScheduleItem,
-    LL,
-    dayBox,
-    scheduleType
-  ]);
+  };

  return (
    <SectionContent>
@@ -372,6 +352,7 @@ const Scheduler = () => {
          selectedItem={selectedScheduleItem}
          validator={schedulerItemValidation(schedule, selectedScheduleItem)}
          dow={dow}
+          commandNames={commandNames.map((ci) => ci.name)}
        />
      )}

@@ -1,9 +1,9 @@
-import { useCallback, useEffect, useMemo, useState } from 'react';
+import { useEffect, useState } from 'react';

 import AddIcon from '@mui/icons-material/Add';
 import CancelIcon from '@mui/icons-material/Cancel';
+import CircleIcon from '@mui/icons-material/Circle';
 import DoneIcon from '@mui/icons-material/Done';
-import PlayArrowIcon from '@mui/icons-material/PlayArrow';
 import RemoveIcon from '@mui/icons-material/RemoveCircleOutlined';
 import {
  Box,
@@ -14,6 +14,7 @@ import {
  DialogContent,
  DialogTitle,
  Grid,
+  MenuItem,
  TextField,
  ToggleButton,
  ToggleButtonGroup,
@@ -21,12 +22,12 @@ import {
 } from '@mui/material';

 import { dialogStyle } from 'CustomTheme';
-import type Schema from 'async-validator';
-import type { ValidateFieldsError } from 'async-validator';
 import { BlockFormControlLabel, ValidatedTextField } from 'components';
 import { useI18nContext } from 'i18n/i18n-react';
 import { updateValue } from 'utils';
 import { ValidationError, validate } from 'validators';
+import type Schema from 'validators/schema';
+import type { ValidateFieldsError } from 'validators/schema';

 import { ScheduleFlag } from './types';
 import type { ScheduleItem } from './types';
@@ -60,6 +61,12 @@ const FLAG_VALUES = [
  ScheduleFlag.SCHEDULE_SAT
 ] as const;

+const getFlagDOWnumber = (flags: string[]) =>
+  flags.reduce((acc, flag) => acc | Number(flag), 0) & FLAG_MASK_127;
+
+const getFlagDOWstring = (f: number) =>
+  FLAG_VALUES.filter((flag) => (f & flag) === flag).map((flag) => String(flag));
+
 interface SchedulerDialogProps {
  open: boolean;
  creating: boolean;
@@ -68,6 +75,7 @@ interface SchedulerDialogProps {
  selectedItem: ScheduleItem;
  validator: Schema;
  dow: string[];
+  commandNames: string[];
 }

 const SchedulerDialog = ({
@@ -77,33 +85,24 @@ const SchedulerDialog = ({
  onSave,
  selectedItem,
  validator,
-  dow
+  dow,
+  commandNames
 }: SchedulerDialogProps) => {
  const { LL } = useI18nContext();
  const [editItem, setEditItem] = useState<ScheduleItem>(selectedItem);
  const [fieldErrors, setFieldErrors] = useState<ValidateFieldsError>();
  const [scheduleType, setScheduleType] = useState<ScheduleFlag>();

-  const updateFormValue = useMemo(
-    () =>
-      updateValue(
-        setEditItem as unknown as React.Dispatch<
-          React.SetStateAction<Record<string, unknown>>
-        >
-      ),
-    []
+  const updateFormValue = updateValue(
+    setEditItem as unknown as React.Dispatch<
+      React.SetStateAction<Record<string, unknown>>
+    >
  );

  useEffect(() => {
    if (open) {
      setFieldErrors(undefined);
      setEditItem(selectedItem);
-      // Set the flags based on type when page is loaded:
-      // 0-127 is day schedule
-      // 128 is timer
-      // 129 is on change
-      // 130 is on condition
-      // 132 is immediate
      setScheduleType(
        selectedItem.flags <= SCHEDULE_TYPE_THRESHOLD
          ? ScheduleFlag.SCHEDULE_DAY
@@ -112,129 +111,89 @@ const SchedulerDialog = ({
    }
  }, [open, selectedItem]);

-  // Helper function to handle save operations
-  const handleSave = useCallback(
-    async (itemToSave: ScheduleItem) => {
-      try {
-        setFieldErrors(undefined);
-        await validate(validator, itemToSave);
-        onSave(itemToSave);
-      } catch (error) {
-        setFieldErrors((error as ValidationError).fieldErrors);
-      }
-    },
-    [validator, onSave]
-  );
-
-  const save = useCallback(async () => {
-    await handleSave(editItem);
-  }, [editItem, handleSave]);
-
-  const saveandactivate = useCallback(async () => {
-    await handleSave({ ...editItem, active: true });
-  }, [editItem, handleSave]);
-
-  const remove = useCallback(() => {
-    onSave({ ...editItem, deleted: true });
-  }, [editItem, onSave]);
-
-  // Optimize DOW flag conversion
-  const getFlagDOWnumber = useCallback((flags: string[]) => {
-    return flags.reduce((acc, flag) => acc | Number(flag), 0) & FLAG_MASK_127;
-  }, []);
-
-  const getFlagDOWstring = useCallback((f: number) => {
-    return FLAG_VALUES.filter((flag) => (f & flag) === flag).map((flag) =>
-      String(flag)
-    );
-  }, []);
-
-  // Day of week display component
-  const DayOfWeekButton = useCallback(
-    (flag: number) => {
-      const dayIndex = Math.log2(flag);
-      const isSelected = (editItem.flags & flag) === flag;
-      return (
-        <Typography
-          sx={{ fontSize: TYPOGRAPHY_FONT_SIZE }}
-          color={isSelected ? 'primary' : 'grey'}
-        >
-          {dow[dayIndex]}
-        </Typography>
-      );
-    },
-    [editItem.flags, dow]
-  );
-
-  const handleClose = useCallback(
-    (_event: React.SyntheticEvent, reason: 'backdropClick' | 'escapeKeyDown') => {
-      if (reason !== 'backdropClick') {
-        onClose();
-      }
-    },
-    [onClose]
-  );
-
-  const handleScheduleTypeChange = useCallback(
-    (_event: React.SyntheticEvent<HTMLElement>, flag: ScheduleFlag | null) => {
-      if (flag !== null) {
-        setFieldErrors(undefined); // clear any validation errors
-        setScheduleType(flag);
-        // wipe the time field when changing the schedule type
-        // set the flags based on type
-        const newFlags = flag === ScheduleFlag.SCHEDULE_DAY ? FLAG_ALL_DAYS : flag;
-        setEditItem((prev) => ({ ...prev, time: '', flags: newFlags }));
-      }
-    },
-    []
-  );
-
-  const handleDOWChange = useCallback(
-    (_event: React.SyntheticEvent<HTMLElement>, flags: string[]) => {
-      const newFlags =
-        getFlagDOWnumber(flags) === 0 ? FLAG_ALL_DAYS : getFlagDOWnumber(flags);
-      setEditItem((prev) => ({ ...prev, flags: newFlags }));
-    },
-    [getFlagDOWnumber]
-  );
-
-  // Memoize derived values
-  const isDaySchedule = useMemo(
-    () => scheduleType === ScheduleFlag.SCHEDULE_DAY,
-    [scheduleType]
-  );
-  const isTimerSchedule = useMemo(
-    () => scheduleType === ScheduleFlag.SCHEDULE_TIMER,
-    [scheduleType]
-  );
-  const isImmediateSchedule = useMemo(
-    () => scheduleType === ScheduleFlag.SCHEDULE_IMMEDIATE,
-    [scheduleType]
-  );
-  const needsTimeField = useMemo(
-    () => isDaySchedule || isTimerSchedule,
-    [isDaySchedule, isTimerSchedule]
-  );
-
-  const dowFlags = useMemo(
-    () => getFlagDOWstring(editItem.flags),
-    [editItem.flags, getFlagDOWstring]
-  );
-
-  const timeFieldValue = useMemo(() => {
-    if (needsTimeField) {
-      return editItem.time === '' ? DEFAULT_TIME : editItem.time;
+  const handleSave = async (itemToSave: ScheduleItem) => {
+    try {
+      setFieldErrors(undefined);
+      await validate(validator, itemToSave);
+      onSave(itemToSave);
+    } catch (error) {
+      setFieldErrors((error as ValidationError).fieldErrors);
    }
-    return editItem.time === DEFAULT_TIME ? '' : editItem.time;
-  }, [editItem.time, needsTimeField]);
+  };

-  const timeFieldLabel = useMemo(() => {
+  const save = async () => {
+    await handleSave(editItem);
+  };
+
+  const remove = () => {
+    onSave({ ...editItem, deleted: true });
+  };
+
+  const DayOfWeekButton = (flag: number) => {
+    const dayIndex = Math.log2(flag);
+    const isSelected = (editItem.flags & flag) === flag;
+    return (
+      <Typography
+        sx={{ fontSize: TYPOGRAPHY_FONT_SIZE }}
+        color={isSelected ? 'primary' : 'grey'}
+      >
+        {dow[dayIndex]}
+      </Typography>
+    );
+  };
+
+  const handleClose = (
+    _event: React.SyntheticEvent,
+    reason: 'backdropClick' | 'escapeKeyDown'
+  ) => {
+    if (reason !== 'backdropClick') {
+      onClose();
+    }
+  };
+
+  const handleScheduleTypeChange = (
+    _event: React.SyntheticEvent<HTMLElement>,
+    flag: ScheduleFlag | null
+  ) => {
+    if (flag !== null) {
+      setFieldErrors(undefined); // clear any validation errors
+      setScheduleType(flag);
+      // wipe the time field when changing the schedule type
+      // set the flags based on type
+      const newFlags = flag === ScheduleFlag.SCHEDULE_DAY ? FLAG_ALL_DAYS : flag;
+      setEditItem((prev) => ({ ...prev, time: '', flags: newFlags }));
+    }
+  };
+
+  const handleDOWChange = (
+    _event: React.SyntheticEvent<HTMLElement>,
+    flags: string[]
+  ) => {
+    const newFlags =
+      getFlagDOWnumber(flags) === 0 ? FLAG_ALL_DAYS : getFlagDOWnumber(flags);
+    setEditItem((prev) => ({ ...prev, flags: newFlags }));
+  };
+
+  const isDaySchedule = scheduleType === ScheduleFlag.SCHEDULE_DAY;
+  const isTimerSchedule = scheduleType === ScheduleFlag.SCHEDULE_TIMER;
+  const needsTimeField = isDaySchedule || isTimerSchedule;
+
+  const dowFlags = getFlagDOWstring(editItem.flags);
+
+  const timeFieldValue = needsTimeField
+    ? editItem.time === ''
+      ? DEFAULT_TIME
+      : editItem.time
+    : editItem.time === DEFAULT_TIME
+      ? ''
+      : editItem.time;
+
+  const timeFieldLabel = (() => {
    if (scheduleType === ScheduleFlag.SCHEDULE_TIMER) return LL.TIMER(1);
    if (scheduleType === ScheduleFlag.SCHEDULE_CONDITION) return LL.CONDITION();
    if (scheduleType === ScheduleFlag.SCHEDULE_ONCHANGE) return LL.ONCHANGE();
-    if (scheduleType === ScheduleFlag.SCHEDULE_IMMEDIATE) return LL.IMMEDIATE();
    return LL.TIME(1);
-  }, [scheduleType, LL]);
+  })();

  return (
    <Dialog sx={dialogStyle} open={open} onClose={handleClose}>
@@ -287,14 +246,6 @@ const SchedulerDialog = ({
              {LL.CONDITION()}
            </Typography>
          </ToggleButton>
-          <ToggleButton value={ScheduleFlag.SCHEDULE_IMMEDIATE}>
-            <Typography
-              sx={{ fontSize: TYPOGRAPHY_FONT_SIZE }}
-              color={isImmediateSchedule ? 'primary' : 'grey'}
-            >
-              {LL.IMMEDIATE()}
-            </Typography>
-          </ToggleButton>
        </ToggleButtonGroup>

        {isDaySchedule && (
@@ -312,78 +263,74 @@ const SchedulerDialog = ({
          </ToggleButtonGroup>
        )}

-        {!isImmediateSchedule && (
-          <>
-            <Grid container>
-              <BlockFormControlLabel
-                control={
-                  <Checkbox
-                    checked={editItem.active}
-                    onChange={updateFormValue}
-                    name="active"
-                  />
-                }
-                label={LL.ACTIVE()}
+        <Grid container>
+          <BlockFormControlLabel
+            control={
+              <Checkbox
+                checked={editItem.active}
+                onChange={updateFormValue}
+                name="active"
              />
-            </Grid>
-            <Grid container>
-              {needsTimeField ? (
-                <>
-                  <TextField
-                    name="time"
-                    type="time"
-                    label={timeFieldLabel}
-                    value={timeFieldValue}
-                    margin="normal"
-                    onChange={updateFormValue}
-                  />
-                  {isTimerSchedule && (
-                    <Typography
-                      sx={{ ml: 2, mt: 4 }}
-                      color="warning"
-                      variant="body2"
-                    >
-                      {LL.SCHEDULER_HELP_2()}
-                    </Typography>
-                  )}
-                </>
-              ) : (
-                <TextField
-                  name="time"
-                  label={timeFieldLabel}
-                  multiline
-                  fullWidth
-                  value={timeFieldValue}
-                  margin="normal"
-                  onChange={updateFormValue}
-                />
+            }
+            label={LL.ACTIVE()}
+          />
+          <CircleIcon
+            color={editItem.active ? 'success' : 'error'}
+            sx={{
+              fontSize: 16,
+              mt: '12px'
+            }}
+          />
+        </Grid>
+
+        <Grid container>
+          {needsTimeField ? (
+            <>
+              <TextField
+                name="time"
+                type="time"
+                label={timeFieldLabel}
+                value={timeFieldValue}
+                margin="normal"
+                onChange={updateFormValue}
+              />
+              {isTimerSchedule && (
+                <Typography sx={{ ml: 2, mt: 4 }} color="warning" variant="body2">
+                  00:00 = {LL.SCHEDULER_HELP_2()}
+                </Typography>
              )}
-            </Grid>
-          </>
-        )}
-        <ValidatedTextField
-          fieldErrors={fieldErrors || {}}
-          name="cmd"
-          label={LL.COMMAND(0)}
-          multiline
-          fullWidth
-          value={editItem.cmd}
-          margin="normal"
-          onChange={updateFormValue}
-        />
+            </>
+          ) : (
+            <TextField
+              name="time"
+              label={timeFieldLabel}
+              multiline
+              fullWidth
+              value={timeFieldValue}
+              margin="normal"
+              onChange={updateFormValue}
+            />
+          )}
+        </Grid>
        <TextField
-          name="value"
-          label={LL.VALUE(0)}
-          multiline
-          margin="normal"
+          name="cmd_name"
+          label={LL.COMMAND(0)}
+          value={editItem.cmd_name}
          fullWidth
-          value={editItem.value}
+          select
+          margin="normal"
          onChange={updateFormValue}
-        />
+        >
+          {commandNames.map((name) => (
+            <MenuItem key={name} value={name}>
+              {name}
+            </MenuItem>
+          ))}
+        </TextField>
        <ValidatedTextField
          fieldErrors={fieldErrors || {}}
          name="name"
-          label={LL.NAME(0) + ' (' + LL.OPTIONAL() + ')'}
+          label={LL.NAME(0)}
          value={editItem.name}
          fullWidth
          margin="normal"
@@ -420,16 +367,6 @@ const SchedulerDialog = ({
        >
          {creating ? LL.ADD(0) : LL.UPDATE()}
        </Button>
-        {isImmediateSchedule && editItem.cmd !== '' && (
-          <Button
-            startIcon={<PlayArrowIcon />}
-            variant="outlined"
-            onClick={saveandactivate}
-            color="success"
-          >
-            {LL.EXECUTE()}
-          </Button>
-        )}
      </DialogActions>
    </Dialog>
  );
@@ -1,5 +1,4 @@
-import { useCallback, useContext, useMemo, useRef, useState } from 'react';
-import { toast } from 'react-toastify';
+import { useContext, useRef, useState } from 'react';

 import AddCircleOutlineOutlinedIcon from '@mui/icons-material/AddCircleOutlineOutlined';
 import KeyboardArrowDownOutlinedIcon from '@mui/icons-material/KeyboardArrowDownOutlined';
@@ -21,6 +20,7 @@ import { useTheme } from '@table-library/react-table-library/theme';
 import type { State } from '@table-library/react-table-library/types/common';
 import { useRequest } from 'alova/client';
 import { SectionContent, useLayoutTitle } from 'components';
+import { toast } from 'components/toast';
 import { AuthenticatedContext } from 'contexts/authentication';
 import { useI18nContext } from 'i18n/i18n-react';
 import { useInterval } from 'utils';
@@ -158,18 +158,16 @@ const Sensors = () => {
    }
  );

-  const intervalCallback = useCallback(() => {
+  useInterval(() => {
    if (!temperatureDialogOpen && !analogDialogOpen) {
      void fetchSensorData();
    }
-  }, [temperatureDialogOpen, analogDialogOpen, fetchSensorData]);
-
-  useInterval(intervalCallback);
+  });

  const temperature_theme = useTheme([common_theme, temperature_theme_config]);
  const analog_theme = useTheme([common_theme, analog_theme_config]);

-  const getSortIcon = useCallback((state: State, sortKey: unknown) => {
+  const getSortIcon = (state: State, sortKey: unknown) => {
    if (state.sortKey === sortKey && state.reverse) {
      return <KeyboardArrowDownOutlinedIcon />;
    }
@@ -177,7 +175,7 @@ const Sensors = () => {
      return <KeyboardArrowUpOutlinedIcon />;
    }
    return <UnfoldMoreOutlinedIcon />;
-  }, []);
+  };

  const analog_sort = useSort(
    { nodes: sensorData.as },
@@ -234,119 +232,104 @@ const Sensors = () => {

  useLayoutTitle(LL.SENSORS());

-  const formatDurationMin = useCallback(
-    (duration_min: number) => {
-      const totalMs = duration_min * MS_PER_MINUTE;
-      const days = Math.trunc(totalMs / MS_PER_DAY);
-      const hours = Math.trunc(totalMs / MS_PER_HOUR) % 24;
-      const minutes = Math.trunc(totalMs / MS_PER_MINUTE) % 60;
+  const formatDurationMin = (duration_min: number) => {
+    const totalMs = duration_min * MS_PER_MINUTE;
+    const days = Math.trunc(totalMs / MS_PER_DAY);
+    const hours = Math.trunc(totalMs / MS_PER_HOUR) % 24;
+    const minutes = Math.trunc(totalMs / MS_PER_MINUTE) % 60;

-      const parts: string[] = [];
-      if (days > 0) {
-        parts.push(LL.NUM_DAYS({ num: days }));
-      }
-      if (hours > 0) {
-        parts.push(LL.NUM_HOURS({ num: hours }));
-      }
-      if (minutes > 0) {
-        parts.push(LL.NUM_MINUTES({ num: minutes }));
-      }
-      return parts.join(' ');
-    },
-    [LL]
-  );
+    const parts: string[] = [];
+    if (days > 0) {
+      parts.push(LL.NUM_DAYS({ num: days }));
+    }
+    if (hours > 0) {
+      parts.push(LL.NUM_HOURS({ num: hours }));
+    }
+    if (minutes > 0) {
+      parts.push(LL.NUM_MINUTES({ num: minutes }));
+    }
+    return parts.join(' ');
+  };

-  const formatValue = useCallback(
-    (value: unknown, uom: DeviceValueUOM) => {
-      if (value === undefined) {
-        return '';
-      }
-      if (typeof value !== 'number') {
-        return value as string;
-      }
-      switch (uom) {
-        case DeviceValueUOM.HOURS:
-          return value ? formatDurationMin(value * 60) : LL.NUM_HOURS({ num: 0 });
-        case DeviceValueUOM.MINUTES:
-          return value ? formatDurationMin(value) : LL.NUM_MINUTES({ num: 0 });
-        case DeviceValueUOM.SECONDS:
-          return LL.NUM_SECONDS({ num: value });
-        case DeviceValueUOM.NONE:
-          return new Intl.NumberFormat().format(value);
-        case DeviceValueUOM.DEGREES:
-        case DeviceValueUOM.DEGREES_R:
-        case DeviceValueUOM.FAHRENHEIT:
-          return (
-            new Intl.NumberFormat(undefined, {
-              minimumFractionDigits: 1
-            }).format(value) +
-            ' ' +
-            DeviceValueUOM_s[uom]
-          );
-        default:
-          return new Intl.NumberFormat().format(value) + ' ' + DeviceValueUOM_s[uom];
-      }
-    },
-    [formatDurationMin, LL]
-  );
+  const formatValue = (value: unknown, uom: DeviceValueUOM) => {
+    if (value === undefined) {
+      return '';
+    }
+    if (typeof value !== 'number') {
+      return value as string;
+    }
+    switch (uom) {
+      case DeviceValueUOM.HOURS:
+        return value ? formatDurationMin(value * 60) : LL.NUM_HOURS({ num: 0 });
+      case DeviceValueUOM.MINUTES:
+        return value ? formatDurationMin(value) : LL.NUM_MINUTES({ num: 0 });
+      case DeviceValueUOM.SECONDS:
+        return LL.NUM_SECONDS({ num: value });
+      case DeviceValueUOM.NONE:
+        return new Intl.NumberFormat().format(value);
+      case DeviceValueUOM.DEGREES:
+      case DeviceValueUOM.DEGREES_R:
+      case DeviceValueUOM.FAHRENHEIT:
+        return (
+          new Intl.NumberFormat(undefined, {
+            minimumFractionDigits: 1
+          }).format(value) +
+          ' ' +
+          DeviceValueUOM_s[uom]
+        );
+      default:
+        return new Intl.NumberFormat().format(value) + ' ' + DeviceValueUOM_s[uom];
+    }
+  };

-  const updateTemperatureSensor = useCallback(
-    (ts: TemperatureSensor) => {
-      if (me.admin) {
-        ts.o_n = ts.n;
-        setSelectedTemperatureSensor(ts);
-        setTemperatureDialogOpen(true);
-      }
-    },
-    [me.admin]
-  );
+  const updateTemperatureSensor = (ts: TemperatureSensor) => {
+    if (me.admin) {
+      ts.o_n = ts.n;
+      setSelectedTemperatureSensor(ts);
+      setTemperatureDialogOpen(true);
+    }
+  };

-  const onTemperatureDialogClose = useCallback(() => {
+  const onTemperatureDialogClose = () => {
    setTemperatureDialogOpen(false);
    void fetchSensorData();
-  }, [fetchSensorData]);
+  };

-  const onTemperatureDialogSave = useCallback(
-    async (ts: TemperatureSensor) => {
-      await sendTemperatureSensor({
-        id: ts.id,
-        name: ts.n,
-        offset: ts.o,
-        is_system: ts.s
+  const onTemperatureDialogSave = async (ts: TemperatureSensor) => {
+    await sendTemperatureSensor({
+      id: ts.id,
+      name: ts.n,
+      offset: ts.o,
+      is_system: ts.s
+    })
+      .then(() => {
+        toast.success(LL.UPDATED_OF(LL.SENSOR(1)));
      })
-        .then(() => {
-          toast.success(LL.UPDATED_OF(LL.SENSOR(1)));
-        })
-        .catch(() => {
-          toast.error(LL.UPDATE_OF(LL.SENSOR(2)) + ' ' + LL.FAILED(1));
-        })
-        .finally(() => {
-          setTemperatureDialogOpen(false);
-          setSelectedTemperatureSensor(undefined);
-          void fetchSensorData();
-        });
-    },
-    [sendTemperatureSensor, LL, fetchSensorData]
-  );
+      .catch(() => {
+        toast.error(LL.UPDATE_OF(LL.SENSOR(2)) + ' ' + LL.FAILED(1));
+      })
+      .finally(() => {
+        setTemperatureDialogOpen(false);
+        setSelectedTemperatureSensor(undefined);
+        void fetchSensorData();
+      });
+  };

-  const updateAnalogSensor = useCallback(
-    (as: AnalogSensor) => {
-      if (me.admin) {
-        setCreating(false);
-        as.o_n = as.n;
-        setSelectedAnalogSensor(as);
-        setAnalogDialogOpen(true);
-      }
-    },
-    [me.admin]
-  );
+  const updateAnalogSensor = (as: AnalogSensor) => {
+    if (me.admin) {
+      setCreating(false);
+      as.o_n = as.n;
+      setSelectedAnalogSensor(as);
+      setAnalogDialogOpen(true);
+    }
+  };

-  const onAnalogDialogClose = useCallback(() => {
+  const onAnalogDialogClose = () => {
    setAnalogDialogOpen(false);
    void fetchSensorData();
-  }, [fetchSensorData]);
+  };

-  const addAnalogSensor = useCallback(() => {
+  const addAnalogSensor = () => {
    if (firstAvailableGPIO.current === undefined) {
      toast.error(LL.NO_GPIO());
      return;
@@ -366,194 +349,167 @@ const Sensors = () => {
      o_n: ''
    });
    setAnalogDialogOpen(true);
-  }, []);
+  };

-  const onAnalogDialogSave = useCallback(
-    async (as: AnalogSensor) => {
-      await sendAnalogSensor({
-        id: as.id,
-        gpio: as.g,
-        name: as.n,
-        offset: as.o,
-        factor: as.f,
-        uom: as.u,
-        type: as.t,
-        deleted: as.d,
-        is_system: as.s
+  const onAnalogDialogSave = async (as: AnalogSensor) => {
+    await sendAnalogSensor({
+      id: as.id,
+      gpio: as.g,
+      name: as.n,
+      offset: as.o,
+      factor: as.f,
+      uom: as.u,
+      type: as.t,
+      deleted: as.d,
+      is_system: as.s
+    })
+      .then(() => {
+        toast.success(LL.UPDATED_OF(LL.ANALOG_SENSOR(2)));
      })
-        .then(() => {
-          toast.success(LL.UPDATED_OF(LL.ANALOG_SENSOR(2)));
-        })
-        .catch(() => {
-          toast.error(LL.UPDATE_OF(LL.ANALOG_SENSOR(5)) + ' ' + LL.FAILED(1));
-        })
-        .finally(() => {
-          setAnalogDialogOpen(false);
-          setSelectedAnalogSensor(undefined);
-          void fetchSensorData();
-        });
-    },
-    [sendAnalogSensor, LL, fetchSensorData]
+      .catch(() => {
+        toast.error(LL.UPDATE_OF(LL.ANALOG_SENSOR(5)) + ' ' + LL.FAILED(1));
+      })
+      .finally(() => {
+        setAnalogDialogOpen(false);
+        setSelectedAnalogSensor(undefined);
+        void fetchSensorData();
+      });
+  };
+
+  const RenderAnalogSensors = (
+    <Table
+      data={{ nodes: sensorData.as }}
+      theme={analog_theme}
+      sort={analog_sort}
+      layout={{ custom: true }}
+    >
+      {(tableList: AnalogSensor[]) => (
+        <>
+          <Header>
+            <HeaderRow>
+              <HeaderCell stiff>
+                <Button
+                  fullWidth
+                  style={HEADER_BUTTON_STYLE}
+                  endIcon={getSortIcon(analog_sort.state, 'GPIO')}
+                  onClick={() => analog_sort.fns.onToggleSort({ sortKey: 'GPIO' })}
+                >
+                  GPIO
+                </Button>
+              </HeaderCell>
+              <HeaderCell resize>
+                <Button
+                  fullWidth
+                  style={HEADER_BUTTON_STYLE}
+                  endIcon={getSortIcon(analog_sort.state, 'NAME')}
+                  onClick={() => analog_sort.fns.onToggleSort({ sortKey: 'NAME' })}
+                >
+                  {LL.NAME(0)}
+                </Button>
+              </HeaderCell>
+              <HeaderCell stiff>
+                <Button
+                  fullWidth
+                  style={HEADER_BUTTON_STYLE}
+                  endIcon={getSortIcon(analog_sort.state, 'TYPE')}
+                  onClick={() => analog_sort.fns.onToggleSort({ sortKey: 'TYPE' })}
+                >
+                  {LL.TYPE(0)}
+                </Button>
+              </HeaderCell>
+              <HeaderCell stiff>
+                <Button
+                  fullWidth
+                  style={HEADER_BUTTON_STYLE_END}
+                  endIcon={getSortIcon(analog_sort.state, 'VALUE')}
+                  onClick={() => analog_sort.fns.onToggleSort({ sortKey: 'VALUE' })}
+                >
+                  {LL.VALUE(0)}
+                </Button>
+              </HeaderCell>
+            </HeaderRow>
+          </Header>
+          <Body>
+            {tableList.map((as: AnalogSensor) => (
+              <Row
+                style={{ color: as.s ? 'grey' : 'inherit' }}
+                key={as.id}
+                item={as}
+                onClick={() => updateAnalogSensor(as)}
+              >
+                <Cell stiff>{as.g}</Cell>
+                <Cell>{as.n}</Cell>
+                <Cell stiff>{AnalogTypeNames[as.t - 1]} </Cell>
+                {(as.t === AnalogType.DIGITAL_OUT &&
+                  as.g !== GPIO_25 &&
+                  as.g !== GPIO_26) ||
+                as.t === AnalogType.DIGITAL_IN ||
+                as.t === AnalogType.PULSE ? (
+                  <Cell stiff>{as.v ? LL.ON() : LL.OFF()}</Cell>
+                ) : (
+                  <Cell stiff>{formatValue(as.v, as.u)}</Cell>
+                )}
+              </Row>
+            ))}
+          </Body>
+        </>
+      )}
+    </Table>
  );

-  const RenderAnalogSensors = useMemo(
-    () => (
-      <Table
-        data={{ nodes: sensorData.as }}
-        theme={analog_theme}
-        sort={analog_sort}
-        layout={{ custom: true }}
-      >
-        {(tableList: AnalogSensor[]) => (
-          <>
-            <Header>
-              <HeaderRow>
-                <HeaderCell stiff>
-                  <Button
-                    fullWidth
-                    style={HEADER_BUTTON_STYLE}
-                    endIcon={getSortIcon(analog_sort.state, 'GPIO')}
-                    onClick={() => analog_sort.fns.onToggleSort({ sortKey: 'GPIO' })}
-                  >
-                    GPIO
-                  </Button>
-                </HeaderCell>
-                <HeaderCell resize>
-                  <Button
-                    fullWidth
-                    style={HEADER_BUTTON_STYLE}
-                    endIcon={getSortIcon(analog_sort.state, 'NAME')}
-                    onClick={() => analog_sort.fns.onToggleSort({ sortKey: 'NAME' })}
-                  >
-                    {LL.NAME(0)}
-                  </Button>
-                </HeaderCell>
-                <HeaderCell stiff>
-                  <Button
-                    fullWidth
-                    style={HEADER_BUTTON_STYLE}
-                    endIcon={getSortIcon(analog_sort.state, 'TYPE')}
-                    onClick={() => analog_sort.fns.onToggleSort({ sortKey: 'TYPE' })}
-                  >
-                    {LL.TYPE(0)}
-                  </Button>
-                </HeaderCell>
-                <HeaderCell stiff>
-                  <Button
-                    fullWidth
-                    style={HEADER_BUTTON_STYLE_END}
-                    endIcon={getSortIcon(analog_sort.state, 'VALUE')}
-                    onClick={() =>
-                      analog_sort.fns.onToggleSort({ sortKey: 'VALUE' })
-                    }
-                  >
-                    {LL.VALUE(0)}
-                  </Button>
-                </HeaderCell>
-              </HeaderRow>
-            </Header>
-            <Body>
-              {tableList.map((as: AnalogSensor) => (
-                <Row
-                  style={{ color: as.s ? 'grey' : 'inherit' }}
-                  key={as.id}
-                  item={as}
-                  onClick={() => updateAnalogSensor(as)}
+  const RenderTemperatureSensors = (
+    <Table
+      data={{ nodes: sensorData.ts }}
+      theme={temperature_theme}
+      sort={temperature_sort}
+      layout={{ custom: true }}
+    >
+      {(tableList: TemperatureSensor[]) => (
+        <>
+          <Header>
+            <HeaderRow>
+              <HeaderCell resize>
+                <Button
+                  fullWidth
+                  style={HEADER_BUTTON_STYLE}
+                  endIcon={getSortIcon(temperature_sort.state, 'NAME')}
+                  onClick={() =>
+                    temperature_sort.fns.onToggleSort({ sortKey: 'NAME' })
+                  }
                >
-                  <Cell stiff>{as.g}</Cell>
-                  <Cell>{as.n}</Cell>
-                  <Cell stiff>{AnalogTypeNames[as.t - 1]} </Cell>
-                  {(as.t === AnalogType.DIGITAL_OUT &&
-                    as.g !== GPIO_25 &&
-                    as.g !== GPIO_26) ||
-                  as.t === AnalogType.DIGITAL_IN ||
-                  as.t === AnalogType.PULSE ? (
-                    <Cell stiff>{as.v ? LL.ON() : LL.OFF()}</Cell>
-                  ) : (
-                    <Cell stiff>{formatValue(as.v, as.u)}</Cell>
-                  )}
-                </Row>
-              ))}
-            </Body>
-          </>
-        )}
-      </Table>
-    ),
-    [
-      analog_sort,
-      analog_theme,
-      getSortIcon,
-      sensorData.as,
-      LL,
-      updateAnalogSensor,
-      formatValue
-    ]
-  );
-
-  const RenderTemperatureSensors = useMemo(
-    () => (
-      <Table
-        data={{ nodes: sensorData.ts }}
-        theme={temperature_theme}
-        sort={temperature_sort}
-        layout={{ custom: true }}
-      >
-        {(tableList: TemperatureSensor[]) => (
-          <>
-            <Header>
-              <HeaderRow>
-                <HeaderCell resize>
-                  <Button
-                    fullWidth
-                    style={HEADER_BUTTON_STYLE}
-                    endIcon={getSortIcon(temperature_sort.state, 'NAME')}
-                    onClick={() =>
-                      temperature_sort.fns.onToggleSort({ sortKey: 'NAME' })
-                    }
-                  >
-                    {LL.NAME(0)}
-                  </Button>
-                </HeaderCell>
-                <HeaderCell stiff>
-                  <Button
-                    fullWidth
-                    style={HEADER_BUTTON_STYLE_END}
-                    endIcon={getSortIcon(temperature_sort.state, 'VALUE')}
-                    onClick={() =>
-                      temperature_sort.fns.onToggleSort({ sortKey: 'VALUE' })
-                    }
-                  >
-                    {LL.VALUE(0)}
-                  </Button>
-                </HeaderCell>
-              </HeaderRow>
-            </Header>
-            <Body>
-              {tableList.map((ts: TemperatureSensor) => (
-                <Row
-                  style={{ color: ts.s ? 'grey' : 'inherit' }}
-                  key={ts.id}
-                  item={ts}
-                  onClick={() => updateTemperatureSensor(ts)}
+                  {LL.NAME(0)}
+                </Button>
+              </HeaderCell>
+              <HeaderCell stiff>
+                <Button
+                  fullWidth
+                  style={HEADER_BUTTON_STYLE_END}
+                  endIcon={getSortIcon(temperature_sort.state, 'VALUE')}
+                  onClick={() =>
+                    temperature_sort.fns.onToggleSort({ sortKey: 'VALUE' })
+                  }
                >
-                  <Cell>{ts.n}</Cell>
-                  <Cell>{formatValue(ts.t, ts.u)}</Cell>
-                </Row>
-              ))}
-            </Body>
-          </>
-        )}
-      </Table>
-    ),
-    [
-      temperature_sort,
-      temperature_theme,
-      getSortIcon,
-      sensorData.ts,
-      LL,
-      updateTemperatureSensor,
-      formatValue
-    ]
+                  {LL.VALUE(0)}
+                </Button>
+              </HeaderCell>
+            </HeaderRow>
+          </Header>
+          <Body>
+            {tableList.map((ts: TemperatureSensor) => (
+              <Row
+                style={{ color: ts.s ? 'grey' : 'inherit' }}
+                key={ts.id}
+                item={ts}
+                onClick={() => updateTemperatureSensor(ts)}
+              >
+                <Cell>{ts.n}</Cell>
+                <Cell>{formatValue(ts.t, ts.u)}</Cell>
+              </Row>
+            ))}
+          </Body>
+        </>
+      )}
+    </Table>
  );

  return (
@@ -1,4 +1,4 @@
-import { useCallback, useEffect, useMemo, useState } from 'react';
+import { useEffect, useState } from 'react';

 import CancelIcon from '@mui/icons-material/Cancel';
 import DoneIcon from '@mui/icons-material/Done';
@@ -18,12 +18,12 @@ import {
 } from '@mui/material';

 import { dialogStyle } from 'CustomTheme';
-import type Schema from 'async-validator';
-import type { ValidateFieldsError } from 'async-validator';
 import { ValidatedTextField } from 'components';
 import { useI18nContext } from 'i18n/i18n-react';
 import { numberValue, updateValue } from 'utils';
 import { ValidationError, validate } from 'validators';
+import type Schema from 'validators/schema';
+import type { ValidateFieldsError } from 'validators/schema';

 import { AnalogType, AnalogTypeNames, DeviceValueUOM_s } from './types';
 import type { AnalogSensor } from './types';
@@ -53,84 +53,54 @@ const SensorsAnalogDialog = ({
  const [fieldErrors, setFieldErrors] = useState<ValidateFieldsError>();
  const [editItem, setEditItem] = useState<AnalogSensor>(selectedItem);

-  const updateFormValue = useMemo(
-    () =>
-      updateValue((updater) =>
-        setEditItem(
-          (prev) =>
-            updater(
-              prev as unknown as Record<string, unknown>
-            ) as unknown as AnalogSensor
-        )
-      ),
-    [setEditItem]
+  const updateFormValue = updateValue((updater) =>
+    setEditItem(
+      (prev) =>
+        updater(
+          prev as unknown as Record<string, unknown>
+        ) as unknown as AnalogSensor
+    )
  );

-  // Memoize helper functions to check sensor type conditions
-  const isCounterOrRate = useMemo(
-    () =>
-      editItem.t === AnalogType.COUNTER ||
-      editItem.t === AnalogType.RATE ||
-      (editItem.t >= AnalogType.CNT_0 && editItem.t <= AnalogType.CNT_2),
-    [editItem.t]
-  );
-  const isCounter = useMemo(
-    () =>
-      editItem.t === AnalogType.COUNTER ||
-      (editItem.t >= AnalogType.CNT_0 && editItem.t <= AnalogType.CNT_2),
-    [editItem.t]
-  );
-  const isFreqType = useMemo(
-    () => editItem.t >= AnalogType.FREQ_0 && editItem.t <= AnalogType.FREQ_2,
-    [editItem.t]
-  );
-  const isPWM = useMemo(
-    () =>
-      editItem.t === AnalogType.PWM_0 ||
-      editItem.t === AnalogType.PWM_1 ||
-      editItem.t === AnalogType.PWM_2,
-    [editItem.t]
-  );
-  const isDACOutGPIO = useMemo(
-    () =>
-      editItem.t === AnalogType.DIGITAL_OUT &&
-      (editItem.g === 25 || editItem.g === 26),
-    [editItem.t, editItem.g]
-  );
-  const isDigitalOutGPIO = useMemo(
-    () =>
-      editItem.t === AnalogType.DIGITAL_OUT &&
-      editItem.g !== 25 &&
-      editItem.g !== 26,
-    [editItem.t, editItem.g]
-  );
+  const isCounterOrRate =
+    editItem.t === AnalogType.COUNTER ||
+    editItem.t === AnalogType.RATE ||
+    (editItem.t >= AnalogType.CNT_0 && editItem.t <= AnalogType.CNT_2);
+  const isCounter =
+    editItem.t === AnalogType.COUNTER ||
+    (editItem.t >= AnalogType.CNT_0 && editItem.t <= AnalogType.CNT_2);
+  const isFreqType =
+    editItem.t >= AnalogType.FREQ_0 && editItem.t <= AnalogType.FREQ_2;
+  const isPWM =
+    editItem.t === AnalogType.PWM_0 ||
+    editItem.t === AnalogType.PWM_1 ||
+    editItem.t === AnalogType.PWM_2;
+  const isDACOutGPIO =
+    editItem.t === AnalogType.DIGITAL_OUT &&
+    (editItem.g === 25 || editItem.g === 26);
+  const isDigitalOutGPIO =
+    editItem.t === AnalogType.DIGITAL_OUT && editItem.g !== 25 && editItem.g !== 26;

-  // Memoize menu items to avoid recreation on each render
-  const analogTypeMenuItems = useMemo(
-    () =>
-      AnalogTypeNames.map((val, i) => ({ name: val, value: i + 1 }))
-        .sort((a, b) => a.name.localeCompare(b.name))
-        .map(({ name, value }) => (
-          <MenuItem
-            key={name}
-            value={value}
-            disabled={disabledTypeList?.includes(value)}
-          >
-            {name}
-          </MenuItem>
-        )),
-    [disabledTypeList]
-  );
+  const analogTypeMenuItems = AnalogTypeNames.map((val, i) => ({
+    name: val,
+    value: i + 1
+  }))
+    .sort((a, b) => a.name.localeCompare(b.name))
+    .map(({ name, value }) => (
+      <MenuItem
+        key={name}
+        value={value}
+        disabled={disabledTypeList?.includes(value)}
+      >
+        {name}
+      </MenuItem>
+    ));

-  const uomMenuItems = useMemo(
-    () =>
-      DeviceValueUOM_s.map((val, i) => (
-        <MenuItem key={val} value={i}>
-          {val}
-        </MenuItem>
-      )),
-    []
-  );
+  const uomMenuItems = DeviceValueUOM_s.map((val, i) => (
+    <MenuItem key={val} value={i}>
+      {val}
+    </MenuItem>
+  ));

  const analogGPIOMenuItems = () =>
    // add selectedItem.g to the list
@@ -157,16 +127,16 @@ const SensorsAnalogDialog = ({
    }
  }, [open, selectedItem]);

-  const handleClose = useCallback(
-    (_event: React.SyntheticEvent, reason: 'backdropClick' | 'escapeKeyDown') => {
-      if (reason !== 'backdropClick') {
-        onClose();
-      }
-    },
-    [onClose]
-  );
+  const handleClose = (
+    _event: React.SyntheticEvent,
+    reason: 'backdropClick' | 'escapeKeyDown'
+  ) => {
+    if (reason !== 'backdropClick') {
+      onClose();
+    }
+  };

-  const save = useCallback(async () => {
+  const save = async () => {
    try {
      setFieldErrors(undefined);
      await validate(validator, editItem);
@@ -174,17 +144,13 @@ const SensorsAnalogDialog = ({
    } catch (error) {
      setFieldErrors((error as ValidationError).fieldErrors);
    }
-  }, [validator, editItem, onSave]);
+  };

-  const remove = useCallback(() => {
+  const remove = () => {
    onSave({ ...editItem, d: true });
-  }, [editItem, onSave]);
+  };

-  const dialogTitle = useMemo(
-    () =>
-      `${creating ? LL.ADD(1) + ' ' + LL.NEW(0) : LL.EDIT()} ${LL.ANALOG_SENSOR(0)}`,
-    [creating, LL]
-  );
+  const dialogTitle = `${creating ? LL.ADD(1) + ' ' + LL.NEW(0) : LL.EDIT()} ${LL.ANALOG_SENSOR(0)}`;

  return (
    <Dialog sx={dialogStyle} open={open} onClose={handleClose}>
@@ -1,4 +1,4 @@
-import { useCallback, useEffect, useMemo, useState } from 'react';
+import { useEffect, useState } from 'react';

 import CancelIcon from '@mui/icons-material/Cancel';
 import DoneIcon from '@mui/icons-material/Done';
@@ -16,12 +16,12 @@ import {
 } from '@mui/material';

 import { dialogStyle } from 'CustomTheme';
-import type Schema from 'async-validator';
-import type { ValidateFieldsError } from 'async-validator';
 import { ValidatedTextField } from 'components';
 import { useI18nContext } from 'i18n/i18n-react';
 import { numberValue, updateValue } from 'utils';
 import { ValidationError, validate } from 'validators';
+import type Schema from 'validators/schema';
+import type { ValidateFieldsError } from 'validators/schema';

 import type { TemperatureSensor } from './types';

@@ -50,16 +50,12 @@ const SensorsTemperatureDialog = ({
  const [fieldErrors, setFieldErrors] = useState<ValidateFieldsError>();
  const [editItem, setEditItem] = useState<TemperatureSensor>(selectedItem);

-  const updateFormValue = useMemo(
-    () =>
-      updateValue(
-        setEditItem as unknown as (
-          updater: (
-            prevState: Readonly<Record<string, unknown>>
-          ) => Record<string, unknown>
-        ) => void
-      ),
-    [setEditItem]
+  const updateFormValue = updateValue(
+    setEditItem as unknown as (
+      updater: (
+        prevState: Readonly<Record<string, unknown>>
+      ) => Record<string, unknown>
+    ) => void
  );

  useEffect(() => {
@@ -69,16 +65,13 @@ const SensorsTemperatureDialog = ({
    }
  }, [open, selectedItem]);

-  const handleClose = useCallback(
-    (_event: React.SyntheticEvent, reason?: string) => {
-      if (reason !== 'backdropClick') {
-        onClose();
-      }
-    },
-    [onClose]
-  );
+  const handleClose = (_event: React.SyntheticEvent, reason?: string) => {
+    if (reason !== 'backdropClick') {
+      onClose();
+    }
+  };

-  const save = useCallback(async () => {
+  const save = async () => {
    try {
      setFieldErrors(undefined);
      await validate(validator, editItem);
@@ -86,29 +79,11 @@ const SensorsTemperatureDialog = ({
    } catch (error) {
      setFieldErrors((error as ValidationError).fieldErrors);
    }
-  }, [validator, editItem, onSave]);
-
-  const dialogTitle = useMemo(() => `${LL.EDIT()} ${LL.TEMP_SENSOR()}`, [LL]);
-
-  const offsetValue = useMemo(() => numberValue(editItem.o), [editItem.o]);
-
-  const slotProps = useMemo(
-    () => ({
-      input: {
-        startAdornment: <InputAdornment position="start">{TEMP_UNIT}</InputAdornment>
-      },
-      htmlInput: {
-        min: OFFSET_MIN,
-        max: OFFSET_MAX,
-        step: OFFSET_STEP
-      }
-    }),
-    []
-  );
+  };

  return (
    <Dialog sx={dialogStyle} open={open} onClose={handleClose}>
-      <DialogTitle>{dialogTitle}</DialogTitle>
+      <DialogTitle>{`${LL.EDIT()} ${LL.TEMP_SENSOR()}`}</DialogTitle>
      <DialogContent dividers>
        <Typography sx={{ mb: 2 }} color="warning" variant="body2">
          {LL.ID_OF(LL.SENSOR(0))}: {editItem.id}
@@ -128,12 +103,23 @@ const SensorsTemperatureDialog = ({
            <TextField
              name="o"
              label={LL.OFFSET()}
-              value={offsetValue}
+              value={numberValue(editItem.o)}
              sx={{ width: '11ch' }}
              type="number"
              variant="outlined"
              onChange={updateFormValue}
-              slotProps={slotProps}
+              slotProps={{
+                input: {
+                  startAdornment: (
+                    <InputAdornment position="start">{TEMP_UNIT}</InputAdornment>
+                  )
+                },
+                htmlInput: {
+                  min: OFFSET_MIN,
+                  max: OFFSET_MAX,
+                  step: OFFSET_STEP
+                }
+              }}
            />
          </Grid>
        </Grid>
@@ -1,4 +1,4 @@
-import { memo, useCallback, useContext } from 'react';
+import { memo, useContext } from 'react';

 import PersonIcon from '@mui/icons-material/Person';
 import {
@@ -23,9 +23,9 @@ const UserProfileComponent = () => {

  useLayoutTitle(LL.USER_PROFILE());

-  const handleSignOut = useCallback(() => {
+  const handleSignOut = () => {
    signOut(true);
-  }, [signOut]);
+  };

  return (
    <SectionContent>
@@ -1,4 +1,5 @@
 export interface Settings {
+  system_name: string;
  locale: string;
  tx_mode: number;
  ems_bus_id: number;
@@ -43,7 +44,18 @@ export interface Settings {
  modbus_port: number;
  modbus_max_clients: number;
  modbus_timeout: number;
+  email_enabled: boolean;
+  email_security: number;
+  email_server: string;
+  email_port: number;
+  email_login: string;
+  email_pass: string;
+  email_sender: string;
+  email_recp: string;
+  email_subject: string;
  developer_mode: boolean;
+  disable_reset: boolean;
+  auto_fw_check: boolean;
 }

 export enum busConnectionStatus {
@@ -199,6 +211,18 @@ export enum DeviceValueUOM {
  HERTZ
 }

+export type DeviceValueKind =
+  'value' | 'scheduler' | 'command' | 'deviceCommand' | 'deviceEntity';
+
+export function getDeviceValueKind(item: DeviceValue): DeviceValueKind {
+  if (!item.c) return 'value';
+  if (item.v !== undefined && item.l !== undefined && item.u === undefined)
+    return 'scheduler';
+  if (item.v === undefined && item.l === undefined) return 'command';
+  if (item.u === DeviceValueUOM.NONE) return 'deviceCommand';
+  return 'deviceEntity';
+}
+
 export const DeviceValueUOM_s = [
  '',
  '°C',
@@ -284,6 +308,7 @@ export const BOARD_PROFILES = {
  LOLIN: 'Lolin D32',
  OLIMEX: 'Olimex ESP32-EVB',
  OLIMEXPOE: 'Olimex ESP32-POE',
+  OLIMEXPOEW: 'Olimex ESP32-POE-ISO WROVER (PSRAM)',
  C3MINI: 'Wemos C3 Mini',
  S2MINI: 'Wemos S2 Mini',
  S3MINI: 'Liligo S3'
@@ -339,21 +364,19 @@ export enum DeviceEntityMask {
 }

 export interface ScheduleItem {
-  id: number; // unique index
+  id: number; // unique index for table
  active: boolean;
  deleted?: boolean;
  flags: number;
  time: string; // also used for Condition and On Change
-  cmd: string;
-  value: string;
-  name: string; // can be empty
+  cmd_name: string; // references a named Command
+  name: string;
  o_id?: number;
  o_active?: boolean;
  o_deleted?: boolean;
  o_flags?: number;
  o_time?: string;
-  o_cmd?: string;
-  o_value?: string;
+  o_cmd_name?: string;
  o_name?: string;
 }

@@ -361,6 +384,23 @@ export interface Schedule {
  readonly schedule: readonly ScheduleItem[];
 }

+export interface CommandItem {
+  id: number;
+  cmd: string;
+  value: string;
+  name: string;
+  deleted?: boolean;
+  o_id?: number;
+  o_cmd?: string;
+  o_value?: string;
+  o_name?: string;
+  o_deleted?: boolean;
+}
+
+export interface Commands {
+  readonly commands: readonly CommandItem[];
+}
+
 export interface ModuleItem {
  id: number; // unique index
  key: string;
@@ -391,8 +431,7 @@ export enum ScheduleFlag {
  SCHEDULE_DAY = 0, // no bits set
  SCHEDULE_TIMER = 128, // bit 8
  SCHEDULE_ONCHANGE = 129, // bit 1
-  SCHEDULE_CONDITION = 130, // bit 2
-  SCHEDULE_IMMEDIATE = 132 // bit 3
+  SCHEDULE_CONDITION = 130 // bit 2
 }

 export interface EntityItem {
@@ -435,6 +474,7 @@ export const enum DeviceType {
  ANALOGSENSOR = 2,
  SCHEDULER = 3,
  CUSTOM = 4,
+  COMMAND = 5,
  BOILER,
  THERMOSTAT,
  MIXER,
@@ -1,9 +1,10 @@
-import Schema from 'async-validator';
-import type { InternalRuleItem } from 'async-validator';
+import Schema from 'validators/schema';
+import type { InternalRuleItem } from 'validators/schema';
 import { IP_OR_HOSTNAME_VALIDATOR } from 'validators/shared';

 import type {
  AnalogSensor,
+  CommandItem,
  DeviceValue,
  EntityItem,
  ScheduleItem,
@@ -232,7 +233,29 @@ export const schedulerItemValidation = (
  scheduleItem: ScheduleItem
 ) =>
  new Schema({
-    name: [NAME_PATTERN, uniqueNameValidator(schedule, scheduleItem.o_name)],
+    name: [
+      { required: true, message: 'Name is required' },
+      NAME_PATTERN_REQUIRED,
+      uniqueNameValidator(schedule, scheduleItem.o_name)
+    ],
+    cmd_name: [{ required: true, message: 'Command is required' }]
+  });
+
+export const uniqueCommandNameValidator = (
+  commands: CommandItem[],
+  o_name?: string
+) => createUniqueNameValidator(commands, o_name);
+
+export const commandItemValidation = (
+  commands: CommandItem[],
+  commandItem: CommandItem
+) =>
+  new Schema({
+    name: [
+      { required: true, message: 'Name is required' },
+      NAME_PATTERN_REQUIRED,
+      uniqueCommandNameValidator(commands, commandItem.o_name)
+    ],
    cmd: [
      { required: true, message: 'Command is required' },
      {
@@ -1,4 +1,4 @@
-import { useCallback, useMemo, useState } from 'react';
+import { useState } from 'react';

 import CancelIcon from '@mui/icons-material/Cancel';
 import WarningIcon from '@mui/icons-material/Warning';
@@ -6,7 +6,6 @@ import { Button, Checkbox, MenuItem } from '@mui/material';

 import * as APApi from 'api/ap';

-import type { ValidateFieldsError } from 'async-validator';
 import {
  BlockFormControlLabel,
  BlockNavigation,
@@ -22,9 +21,9 @@ import type { APSettingsType } from 'types';
 import { APProvisionMode } from 'types';
 import { numberValue, updateValueDirty, useRest } from 'utils';
 import { ValidationError, createAPSettingsValidator, validate } from 'validators';
+import type { ValidateFieldsError } from 'validators/schema';

 export const isAPEnabled = ({ provision_mode }: APSettingsType) =>
-  provision_mode === APProvisionMode.AP_MODE_ALWAYS ||
  provision_mode === APProvisionMode.AP_MODE_DISCONNECTED;

 // Efficient range function without recursion
@@ -63,22 +62,16 @@ const APSettings = () => {

  const [fieldErrors, setFieldErrors] = useState<ValidateFieldsError>();

-  const updateFormValue = useMemo(
-    () =>
-      updateValueDirty(
-        origData as unknown as Record<string, unknown>,
-        dirtyFlags,
-        setDirtyFlags,
-        updateDataValue as (value: unknown) => void
-      ),
-    [origData, dirtyFlags, setDirtyFlags, updateDataValue]
+  const updateFormValue = updateValueDirty(
+    origData as unknown as Record<string, unknown>,
+    dirtyFlags,
+    setDirtyFlags,
+    updateDataValue as (value: unknown) => void
  );

-  // Memoize AP enabled state
-  const apEnabled = useMemo(() => (data ? isAPEnabled(data) : false), [data]);
+  const apEnabled = data ? isAPEnabled(data) : false;

-  // Memoize validation and submit handler
-  const validateAndSubmit = useCallback(async () => {
+  const validateAndSubmit = async () => {
    if (!data) return;

    try {
@@ -88,7 +81,7 @@ const APSettings = () => {
    } catch (error) {
      setFieldErrors((error as ValidationError).fieldErrors);
    }
-  }, [data, saveData]);
+  };

  const content = () => {
    if (!data) {
@@ -108,9 +101,6 @@ const APSettings = () => {
          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>
@@ -1,5 +1,4 @@
-import { useCallback, useMemo, useState } from 'react';
-import { toast } from 'react-toastify';
+import { useContext, useEffect, useState } from 'react';

 import CancelIcon from '@mui/icons-material/Cancel';
 import PowerSettingsNewIcon from '@mui/icons-material/PowerSettingsNew';
@@ -20,7 +19,6 @@ import { readSystemStatus } from 'api/system';

 import { useRequest } from 'alova/client';
 import SystemMonitor from 'app/status/SystemMonitor';
-import type { ValidateFieldsError } from 'async-validator';
 import {
  BlockFormControlLabel,
  BlockNavigation,
@@ -28,12 +26,16 @@ import {
  FormLoader,
  MessageBox,
  SectionContent,
+  ValidatedPasswordField,
  ValidatedTextField,
  useLayoutTitle
 } from 'components';
+import { toast } from 'components/toast';
+import { AuthenticatedContext } from 'contexts/authentication';
 import { useI18nContext } from 'i18n/i18n-react';
 import { numberValue, updateValueDirty, useRest } from 'utils';
 import { ValidationError, validate } from 'validators';
+import type { ValidateFieldsError } from 'validators/schema';

 import { API, getBoardProfile, readSettings, writeSettings } from '../../api/app';
 import { BOARD_PROFILES } from '../main/types';
@@ -67,6 +69,14 @@ const ApplicationSettings = () => {
    update: writeSettings
  });

+  // the menu drawer reads the system name from the authentication context
+  const { setSystemName } = useContext(AuthenticatedContext);
+  useEffect(() => {
+    if (origData?.system_name !== undefined) {
+      setSystemName(origData.system_name);
+    }
+  }, [origData?.system_name, setSystemName]);
+
  const [restarting, setRestarting] = useState<boolean>();

  const { LL } = useI18nContext();
@@ -106,82 +116,79 @@ const ApplicationSettings = () => {
    });
  });

-  // Memoized input props to prevent recreation on every render
-  const SecondsInputProps = useMemo(
-    () => ({
-      endAdornment: <InputAdornment position="end">{LL.SECONDS()}</InputAdornment>
-    }),
-    [LL]
-  );
+  const SecondsInputProps = {
+    endAdornment: <InputAdornment position="end">{LL.SECONDS()}</InputAdornment>
+  };

-  const MinutesInputProps = useMemo(
-    () => ({
-      endAdornment: <InputAdornment position="end">{LL.MINUTES()}</InputAdornment>
-    }),
-    [LL]
-  );
+  const MinutesInputProps = {
+    endAdornment: <InputAdornment position="end">{LL.MINUTES()}</InputAdornment>
+  };

-  const HoursInputProps = useMemo(
-    () => ({
-      endAdornment: <InputAdornment position="end">{LL.HOURS()}</InputAdornment>
-    }),
-    [LL]
-  );
+  const HoursInputProps = {
+    endAdornment: <InputAdornment position="end">{LL.HOURS()}</InputAdornment>
+  };

-  const doRestart = useCallback(async () => {
+  const doRestart = async () => {
    setRestarting(true);
    await sendAPI({ device: 'system', cmd: 'restart', id: 0 }).catch(
      (error: Error) => {
        toast.error(error.message);
      }
    );
-  }, [sendAPI]);
+  };

-  const updateBoardProfile = useCallback(
-    async (board_profile: string) => {
-      await readBoardProfile(board_profile).catch((error: Error) => {
-        toast.error(error.message);
-      });
-    },
-    [readBoardProfile]
-  );
+  const updateBoardProfile = async (board_profile: string) => {
+    await readBoardProfile(board_profile).catch((error: Error) => {
+      toast.error(error.message);
+    });
+  };

  useLayoutTitle(LL.APPLICATION());

-  const validateAndSubmit = useCallback(async () => {
+  const validateAndSubmit = async () => {
    try {
      setFieldErrors(undefined);
      await validate(createSettingsValidator(data), data);
+      await saveData();
    } catch (error) {
      setFieldErrors((error as ValidationError).fieldErrors);
-    } finally {
-      await saveData();
    }
-  }, [data, saveData]);
+  };

-  const changeBoardProfile = useCallback(
-    (event: React.ChangeEvent<HTMLInputElement>) => {
-      const boardProfile = event.target.value;
-      updateFormValue(event);
-      if (boardProfile === 'CUSTOM') {
-        updateDataValue({
-          ...data,
-          board_profile: boardProfile
-        });
-      } else {
-        void updateBoardProfile(boardProfile);
-      }
-    },
-    [data, updateBoardProfile, updateFormValue, updateDataValue]
-  );
+  const changeBoardProfile = (event: React.ChangeEvent<HTMLInputElement>) => {
+    const boardProfile = event.target.value;
+    updateFormValue(event);
+    if (boardProfile === 'CUSTOM') {
+      updateDataValue({
+        ...data,
+        board_profile: boardProfile
+      });
+    } else {
+      void updateBoardProfile(boardProfile);
+    }
+  };

-  const restart = useCallback(async () => {
+  const restart = async () => {
    await validateAndSubmit();
    await doRestart();
-  }, [validateAndSubmit, doRestart]);
+  };

-  // Memoize board profile select items to prevent recreation
-  const boardProfileItems = useMemo(() => boardProfileSelectItems(), []);
+  const sendmail = async () => {
+    await sendAPI({
+      device: 'system',
+      cmd: 'sendmail',
+      data: '"Email notification test successful!"',
+      id: 0
+    })
+      .then(() => {
+        toast.success(LL.TEST_EMAIL_SUCCESSFUL());
+      })
+      .catch((error: Error) => {
+        toast.error(error.message);
+      });
+  };
+
+  const boardProfileItems = boardProfileSelectItems();

  const content = () => {
    if (!data || !hardwareData) {
@@ -190,7 +197,19 @@ const ApplicationSettings = () => {

    return (
      <>
-        <Typography sx={{ pb: 1 }} variant="h6" color="primary">
+        <Typography variant="h6" color="primary">
+          {LL.SYSTEM(0)}&nbsp;
+          {LL.CUSTOMIZATIONS()}
+        </Typography>
+        <TextField
+          name="system_name"
+          label={LL.SYSTEM_NAME()}
+          value={data.system_name}
+          variant="outlined"
+          onChange={updateFormValue}
+          margin="normal"
+        />
+        <Typography sx={{ pb: 1, pt: 2 }} variant="h6" color="primary">
          {LL.SERVICES()}
        </Typography>
        <Typography color="secondary">API</Typography>
@@ -351,6 +370,160 @@ const ApplicationSettings = () => {
            </Grid>
          </Grid>
        )}
+        <Typography color="secondary">eMail</Typography>
+        <BlockFormControlLabel
+          control={
+            <Checkbox
+              checked={data.email_enabled}
+              onChange={updateFormValue}
+              name="email_enabled"
+              disabled={!hardwareData.psram}
+            />
+          }
+          label={
+            <Typography color={!hardwareData.psram ? 'grey' : 'default'}>
+              Enable eMail notification
+              {!hardwareData.psram && (
+                <Typography variant="caption">
+                  &nbsp; &#40;{LL.IS_REQUIRED('PSRAM')}&#41;
+                </Typography>
+              )}
+            </Typography>
+          }
+        />
+        {data.email_enabled && (
+          <>
+            <Grid
+              container
+              spacing={2}
+              direction="row"
+              sx={{ justifyContent: 'flex-start', alignItems: 'flex-start' }}
+            >
+              <Grid>
+                <ValidatedTextField
+                  fieldErrors={fieldErrors || {}}
+                  name="email_server"
+                  label="SMTP Server"
+                  variant="outlined"
+                  value={data.email_server}
+                  onChange={updateFormValue}
+                  margin="normal"
+                />
+              </Grid>
+              <Grid>
+                <ValidatedTextField
+                  fieldErrors={fieldErrors || {}}
+                  sx={{ width: '12ch' }}
+                  name="email_port"
+                  variant="outlined"
+                  label="Port"
+                  value={numberValue(data.email_port)}
+                  type="number"
+                  onChange={updateFormValue}
+                  margin="normal"
+                />
+              </Grid>
+              <Grid>
+                <TextField
+                  sx={{ width: '20ch' }}
+                  name="email_security"
+                  label={LL.SECURITY(0)}
+                  value={data.email_security}
+                  variant="outlined"
+                  onChange={updateFormValue}
+                  margin="normal"
+                  select
+                >
+                  <MenuItem value={0}>{LL.OFF()}</MenuItem>
+                  <MenuItem value={1}>SSL</MenuItem>
+                  <MenuItem value={2}>StartTLS</MenuItem>
+                </TextField>
+              </Grid>
+            </Grid>
+            <Grid container spacing={2} rowSpacing={0}>
+              <Grid>
+                <ValidatedTextField
+                  fieldErrors={fieldErrors || {}}
+                  name="email_login"
+                  label="Login"
+                  variant="outlined"
+                  value={data.email_login}
+                  onChange={updateFormValue}
+                  margin="normal"
+                />
+              </Grid>
+              <Grid>
+                <ValidatedPasswordField
+                  fieldErrors={fieldErrors || {}}
+                  name="email_pass"
+                  label="Password"
+                  variant="outlined"
+                  value={data.email_pass}
+                  onChange={updateFormValue}
+                  margin="normal"
+                />
+              </Grid>
+            </Grid>
+            <Grid container spacing={2} rowSpacing={0}>
+              <Grid>
+                <ValidatedTextField
+                  fieldErrors={fieldErrors || {}}
+                  name="email_sender"
+                  label="From"
+                  variant="outlined"
+                  value={data.email_sender}
+                  onChange={updateFormValue}
+                  margin="normal"
+                />
+              </Grid>
+              <Grid>
+                <ValidatedTextField
+                  fieldErrors={fieldErrors || {}}
+                  name="email_recp"
+                  label="To"
+                  variant="outlined"
+                  value={data.email_recp}
+                  onChange={updateFormValue}
+                  margin="normal"
+                />
+              </Grid>
+              <Grid>
+                <ValidatedTextField
+                  fieldErrors={fieldErrors || {}}
+                  name="email_subject"
+                  label="Subject"
+                  variant="outlined"
+                  value={data.email_subject}
+                  onChange={updateFormValue}
+                  margin="normal"
+                />
+              </Grid>
+              <Grid>
+                <Button
+                  sx={{ mt: 3 }}
+                  variant="outlined"
+                  color="primary"
+                  disabled={dirtyFlags.length !== 0}
+                  onClick={sendmail}
+                >
+                  Send test email
+                </Button>
+              </Grid>
+            </Grid>
+          </>
+        )}
+        <Typography color="secondary">Firmware</Typography>
+        <BlockFormControlLabel
+          control={
+            <Checkbox
+              checked={data.auto_fw_check}
+              onChange={updateFormValue}
+              name="auto_fw_check"
+            />
+          }
+          label={LL.AUTO_FW_CHECK()}
+        />
+
        <Typography sx={{ pb: 1, pt: 2 }} variant="h6" color="primary">
          {LL.SENSORS()}
        </Typography>
@@ -751,6 +924,16 @@ const ApplicationSettings = () => {
          }
          label={LL.DEVELOPER_MODE()}
        />
+        <BlockFormControlLabel
+          control={
+            <Checkbox
+              checked={data.disable_reset}
+              onChange={updateFormValue}
+              name="disable_reset"
+            />
+          }
+          label={LL.DISABLE_RESET()}
+        />
        <BlockFormControlLabel
          control={
            <Checkbox
@@ -1,5 +1,4 @@
-import { useCallback, useMemo, useState } from 'react';
-import { toast } from 'react-toastify';
+import { useState } from 'react';

 import CancelIcon from '@mui/icons-material/Cancel';
 import DownloadIcon from '@mui/icons-material/GetApp';
@@ -27,6 +26,7 @@ import {
  SingleUpload,
  useLayoutTitle
 } from 'components';
+import { toast } from 'components/toast';
 import { useI18nContext } from 'i18n/i18n-react';
 import { saveFile } from 'utils';

@@ -57,7 +57,7 @@ const DownloadUpload = () => {

  const { data, send: loadData, error } = useRequest(SystemApi.readSystemStatus);

-  const doRestart = useCallback(async () => {
+  const doRestart = async () => {
    setRestarting(true);
    try {
      await sendAPI({ device: 'system', cmd: 'restart', id: 0 });
@@ -65,16 +65,33 @@ const DownloadUpload = () => {
      toast.error((error as Error).message);
      setRestarting(false);
    }
-  }, [sendAPI]);
+  };

  useLayoutTitle(LL.DOWNLOAD_UPLOAD());

-  const handleCloseBackupDialog = useCallback(() => {
+  const handleCloseBackupDialog = () => {
    setConfirmBackup(false);
-  }, []);
+  };

-  const renderBackupDialog = useMemo(
-    () => (
+  const handleDownload = (type: string) => () => {
+    void sendExportData(type);
+    setConfirmBackup(false);
+  };
+
+  if (restarting) {
+    return <SystemMonitor />;
+  }
+
+  if (!data) {
+    return (
+      <SectionContent>
+        <FormLoader onRetry={loadData} errorMessage={error?.message || ''} />
+      </SectionContent>
+    );
+  }
+
+  return (
+    <SectionContent>
      <Dialog
        sx={dialogStyle}
        open={confirmBackup}
@@ -98,40 +115,13 @@ const DownloadUpload = () => {
          <Button
            startIcon={<DownloadIcon />}
            variant="outlined"
-            onClick={() => handleDownload('systembackup')()}
+            onClick={handleDownload('systembackup')}
            color="primary"
          >
            {LL.DOWNLOAD(0)}
          </Button>
        </DialogActions>
      </Dialog>
-    ),
-    [confirmBackup, handleCloseBackupDialog, LL]
-  );
-
-  const handleDownload = useCallback(
-    (type: string) => () => {
-      void sendExportData(type);
-      setConfirmBackup(false);
-    },
-    [sendExportData]
-  );
-
-  if (restarting) {
-    return <SystemMonitor />;
-  }
-
-  if (!data) {
-    return (
-      <SectionContent>
-        <FormLoader onRetry={loadData} errorMessage={error?.message || ''} />
-      </SectionContent>
-    );
-  }
-
-  return (
-    <SectionContent>
-      {renderBackupDialog}

      <Typography sx={{ pb: 2 }} variant="h6" color="primary">
        {LL.DOWNLOAD(0)}
@@ -175,11 +165,7 @@ const DownloadUpload = () => {
        {LL.UPLOAD()}
      </Typography>

-      <Typography sx={{ pb: 2 }} color="warning" variant="body1">
-        {LL.UPLOAD_TEXT()}:
-      </Typography>
-
-      <SingleUpload doRestart={doRestart} />
+      <SingleUpload text={LL.UPLOAD_BACKUP_TEXT()} doRestart={doRestart} />
    </SectionContent>
  );
 };
@@ -1,5 +1,4 @@
-import { useCallback, useMemo, useState } from 'react';
-import { toast } from 'react-toastify';
+import { useState } from 'react';

 import CancelIcon from '@mui/icons-material/Cancel';
 import SettingsBackupRestoreIcon from '@mui/icons-material/SettingsBackupRestore';
@@ -17,7 +16,6 @@ import {

 import * as MqttApi from 'api/mqtt';

-import type { ValidateFieldsError } from 'async-validator';
 import {
  BlockFormControlLabel,
  BlockNavigation,
@@ -28,10 +26,12 @@ import {
  ValidatedTextField,
  useLayoutTitle
 } from 'components';
+import { toast } from 'components/toast';
 import { useI18nContext } from 'i18n/i18n-react';
 import type { MqttSettingsType } from 'types';
 import { numberValue, updateValueDirty, useRest } from 'utils';
 import { ValidationError, createMqttSettingsValidator, validate } from 'validators';
+import type { ValidateFieldsError } from 'validators/schema';

 import { callAction } from '../../api/app';

@@ -57,7 +57,7 @@ const MqttSettings = () => {

  const [fieldErrors, setFieldErrors] = useState<ValidateFieldsError>();

-  const sendResetMQTT = useCallback(() => {
+  const sendResetMQTT = () => {
    void callAction({ action: 'resetMQTT' })
      .then(() => {
        toast.success('MQTT ' + LL.REFRESH() + ' successful');
@@ -65,29 +65,20 @@ const MqttSettings = () => {
      .catch((error) => {
        toast.error(String(error.error?.message || 'An error occurred'));
      });
-  }, []);
+  };

-  const updateFormValue = useMemo(
-    () =>
-      updateValueDirty(
-        origData as unknown as Record<string, unknown>,
-        dirtyFlags,
-        setDirtyFlags,
-        updateDataValue as (value: unknown) => void
-      ),
-    [origData, dirtyFlags, setDirtyFlags, updateDataValue]
+  const updateFormValue = updateValueDirty(
+    origData as unknown as Record<string, unknown>,
+    dirtyFlags,
+    setDirtyFlags,
+    updateDataValue as (value: unknown) => void
  );

-  const SecondsInputProps = useMemo(
-    () => ({
-      endAdornment: <InputAdornment position="end">{LL.SECONDS()}</InputAdornment>
-    }),
-    [LL]
-  );
+  const SecondsInputProps = {
+    endAdornment: <InputAdornment position="end">{LL.SECONDS()}</InputAdornment>
+  };

-  const emptyFieldErrors = useMemo(() => ({}), []);
-
-  const validateAndSubmit = useCallback(async () => {
+  const validateAndSubmit = async () => {
    if (!data) return;
    try {
      setFieldErrors(undefined);
@@ -96,25 +87,22 @@ const MqttSettings = () => {
    } catch (error) {
      setFieldErrors((error as ValidationError).fieldErrors);
    }
-  }, [data, saveData]);
+  };

-  const publishIntervalFields = useMemo(
-    () => [
-      { name: 'publish_time_heartbeat', label: 'Heartbeat', validated: true },
-      { name: 'publish_time_boiler', label: LL.MQTT_INT_BOILER(), validated: false },
-      {
-        name: 'publish_time_thermostat',
-        label: LL.MQTT_INT_THERMOSTATS(),
-        validated: false
-      },
-      { name: 'publish_time_solar', label: LL.MQTT_INT_SOLAR(), validated: false },
-      { name: 'publish_time_mixer', label: LL.MQTT_INT_MIXER(), validated: false },
-      { name: 'publish_time_water', label: LL.MQTT_INT_WATER(), validated: false },
-      { name: 'publish_time_sensor', label: LL.SENSORS(), validated: false },
-      { name: 'publish_time_other', label: LL.DEFAULT(0), validated: false }
-    ],
-    [LL]
-  );
+  const publishIntervalFields = [
+    { name: 'publish_time_heartbeat', label: 'Heartbeat', validated: true },
+    { name: 'publish_time_boiler', label: LL.MQTT_INT_BOILER(), validated: false },
+    {
+      name: 'publish_time_thermostat',
+      label: LL.MQTT_INT_THERMOSTATS(),
+      validated: false
+    },
+    { name: 'publish_time_solar', label: LL.MQTT_INT_SOLAR(), validated: false },
+    { name: 'publish_time_mixer', label: LL.MQTT_INT_MIXER(), validated: false },
+    { name: 'publish_time_water', label: LL.MQTT_INT_WATER(), validated: false },
+    { name: 'publish_time_sensor', label: LL.SENSORS(), validated: false },
+    { name: 'publish_time_other', label: LL.DEFAULT(0), validated: false }
+  ];

  if (!data) {
    return (
@@ -154,7 +142,7 @@ const MqttSettings = () => {
        <Grid container spacing={2} rowSpacing={0}>
          <Grid>
            <ValidatedTextField
-              fieldErrors={fieldErrors ?? emptyFieldErrors}
+              fieldErrors={fieldErrors ?? {}}
              name="host"
              label={LL.ADDRESS_OF(LL.BROKER())}
              multiline
@@ -166,7 +154,7 @@ const MqttSettings = () => {
          </Grid>
          <Grid>
            <ValidatedTextField
-              fieldErrors={fieldErrors ?? emptyFieldErrors}
+              fieldErrors={fieldErrors ?? {}}
              name="port"
              label="Port"
              variant="outlined"
@@ -178,7 +166,7 @@ const MqttSettings = () => {
          </Grid>
          <Grid>
            <ValidatedTextField
-              fieldErrors={fieldErrors ?? emptyFieldErrors}
+              fieldErrors={fieldErrors ?? {}}
              name="base"
              label={LL.BASE_TOPIC()}
              variant="outlined"
@@ -219,7 +207,7 @@ const MqttSettings = () => {
          </Grid>
          <Grid>
            <ValidatedTextField
-              fieldErrors={fieldErrors ?? emptyFieldErrors}
+              fieldErrors={fieldErrors ?? {}}
              name="keep_alive"
              label="Keep Alive"
              slotProps={{
@@ -438,7 +426,7 @@ const MqttSettings = () => {
            <Grid key={field.name}>
              {field.validated ? (
                <ValidatedTextField
-                  fieldErrors={fieldErrors ?? emptyFieldErrors}
+                  fieldErrors={fieldErrors ?? {}}
                  name={field.name}
                  label={field.label}
                  slotProps={{
@@ -1,5 +1,4 @@
-import { useCallback, useMemo, useState } from 'react';
-import { toast } from 'react-toastify';
+import { useState } from 'react';

 import AccessTimeIcon from '@mui/icons-material/AccessTime';
 import CancelIcon from '@mui/icons-material/Cancel';
@@ -24,7 +23,6 @@ import { readNTPSettings } from 'api/ntp';
 import { dialogStyle } from 'CustomTheme';
 import { useRequest } from 'alova/client';
 import { updateState } from 'alova/client';
-import type { ValidateFieldsError } from 'async-validator';
 import {
  BlockFormControlLabel,
  BlockNavigation,
@@ -34,11 +32,13 @@ import {
  ValidatedTextField,
  useLayoutTitle
 } from 'components';
+import { toast } from 'components/toast';
 import { useI18nContext } from 'i18n/i18n-react';
 import type { NTPSettingsType, Time } from 'types';
 import { formatLocalDateTime, updateValueDirty, useRest } from 'utils';
 import { ValidationError, validate } from 'validators';
 import { NTP_SETTINGS_VALIDATOR } from 'validators/ntp';
+import type { ValidateFieldsError } from 'validators/schema';

 import {
  TIME_ZONES,
@@ -67,19 +67,16 @@ const NTPSettings = () => {
  const { LL } = useI18nContext();
  useLayoutTitle('NTP');

-  // Memoized timezone select items for better performance
  const timeZoneItems = useTimeZoneSelectItems();
  const timeZoneItemsT = timeZoneSelectItemsT();

-  // Memoized selected timezone value
-  const selectedTzValue = useMemo(
-    () => (data ? selectedTimeZone(data.tz_label, data.tz_format) : undefined),
-    [data?.tz_label, data?.tz_format]
-  );
-  const selectedTzValueT = useMemo(
-    () => (data ? selectedTimeZone(data.tz_label_t, data.tz_format_t) : undefined),
-    [data?.tz_label_t, data?.tz_format_t]
-  );
+  const selectedTzValue = data
+    ? selectedTimeZone(data.tz_label, data.tz_format)
+    : undefined;
+
+  const selectedTzValueT = data
+    ? selectedTimeZone(data.tz_label_t, data.tz_format_t)
+    : undefined;
  const [localTime, setLocalTime] = useState<string>('');
  const [settingTime, setSettingTime] = useState<boolean>(false);
  const [processing, setProcessing] = useState<boolean>(false);
@@ -92,32 +89,22 @@ const NTPSettings = () => {
    }
  );

-  // Memoize updateFormValue to prevent recreation on every render
-  const updateFormValue = useMemo(
-    () =>
-      updateValueDirty(
-        origData as unknown as Record<string, unknown>,
-        dirtyFlags,
-        setDirtyFlags,
-        updateDataValue as (value: unknown) => void
-      ),
-    [origData, dirtyFlags, setDirtyFlags, updateDataValue]
+  const updateFormValue = updateValueDirty(
+    origData as unknown as Record<string, unknown>,
+    dirtyFlags,
+    setDirtyFlags,
+    updateDataValue as (value: unknown) => void
  );

-  // Memoize updateLocalTime handler
-  const updateLocalTime = useCallback(
-    (event: React.ChangeEvent<HTMLInputElement>) => setLocalTime(event.target.value),
-    []
-  );
+  const updateLocalTime = (event: React.ChangeEvent<HTMLInputElement>) =>
+    setLocalTime(event.target.value);

-  // Memoize openSetTime handler
-  const openSetTime = useCallback(() => {
+  const openSetTime = () => {
    setLocalTime(formatLocalDateTime(new Date()));
    setSettingTime(true);
-  }, []);
+  };

-  // Memoize configureTime handler
-  const configureTime = useCallback(async () => {
+  const configureTime = async () => {
    setProcessing(true);

    try {
@@ -130,13 +117,11 @@ const NTPSettings = () => {
    } finally {
      setProcessing(false);
    }
-  }, [localTime, updateTime, LL, loadData]);
+  };

-  // Memoize close dialog handler
-  const handleCloseSetTime = useCallback(() => setSettingTime(false), []);
+  const handleCloseSetTime = () => setSettingTime(false);

-  // Memoize validate and submit handler
-  const validateAndSubmit = useCallback(async () => {
+  const validateAndSubmit = async () => {
    if (!data) return;
    try {
      setFieldErrors(undefined);
@@ -145,35 +130,27 @@ const NTPSettings = () => {
    } catch (error) {
      setFieldErrors((error as ValidationError).fieldErrors);
    }
-  }, [data, saveData]);
+  };

-  // Memoize timezone change handler
-  const changeTimeZone = useCallback(
-    (event: React.ChangeEvent<HTMLInputElement>) => {
-      void updateState(readNTPSettings(), (settings: NTPSettingsType) => ({
-        ...settings,
-        tz_label: event.target.value,
-        tz_format: TIME_ZONES[event.target.value]
-      }));
-      updateFormValue(event);
-    },
-    [updateFormValue]
-  );
+  const changeTimeZone = (event: React.ChangeEvent<HTMLInputElement>) => {
+    void updateState(readNTPSettings(), (settings: NTPSettingsType) => ({
+      ...settings,
+      tz_label: event.target.value,
+      tz_format: TIME_ZONES[event.target.value]
+    }));
+    updateFormValue(event);
+  };

-  const changeTimeZoneT = useCallback(
-    (event: React.ChangeEvent<HTMLInputElement>) => {
-      void updateState(readNTPSettings(), (settings: NTPSettingsType) => ({
-        ...settings,
-        tz_label_t: event.target.value,
-        tz_format_t: TIME_ZONES[event.target.value]
-      }));
-      updateFormValue(event);
-    },
-    [updateFormValue]
-  );
+  const changeTimeZoneT = (event: React.ChangeEvent<HTMLInputElement>) => {
+    void updateState(readNTPSettings(), (settings: NTPSettingsType) => ({
+      ...settings,
+      tz_label_t: event.target.value,
+      tz_format_t: TIME_ZONES[event.target.value]
+    }));
+    updateFormValue(event);
+  };

-  // Memoize render content to prevent unnecessary re-renders
-  const renderContent = useMemo(() => {
+  const renderContent = () => {
    if (!data) {
      return <FormLoader onRetry={loadData} errorMessage={errorMessage || ''} />;
    }
@@ -299,27 +276,12 @@ const NTPSettings = () => {
        )}
      </>
    );
-  }, [
-    data,
-    errorMessage,
-    loadData,
-    updateFormValue,
-    fieldErrors,
-    selectedTzValue,
-    selectedTzValueT,
-    changeTimeZone,
-    timeZoneItems,
-    dirtyFlags,
-    openSetTime,
-    saving,
-    validateAndSubmit,
-    LL
-  ]);
+  };

  return (
    <SectionContent>
      {blocker ? <BlockNavigation blocker={blocker} /> : null}
-      {renderContent}
+      {renderContent()}
      <Dialog sx={dialogStyle} open={settingTime} onClose={handleCloseSetTime}>
        <DialogTitle>{LL.SET_TIME(1)}</DialogTitle>
        <DialogContent dividers>
@@ -1,190 +1,108 @@
-import { useCallback, useMemo, useState } from 'react';
+import { useContext } from 'react';

 import AccessTimeIcon from '@mui/icons-material/AccessTime';
-import CancelIcon from '@mui/icons-material/Cancel';
+import BuildIcon from '@mui/icons-material/Build';
 import DeviceHubIcon from '@mui/icons-material/DeviceHub';
 import ImportExportIcon from '@mui/icons-material/ImportExport';
 import LockIcon from '@mui/icons-material/Lock';
-import SettingsBackupRestoreIcon from '@mui/icons-material/SettingsBackupRestore';
 import SettingsEthernetIcon from '@mui/icons-material/SettingsEthernet';
 import SettingsInputAntennaIcon from '@mui/icons-material/SettingsInputAntenna';
 import TuneIcon from '@mui/icons-material/Tune';
 import ViewModuleIcon from '@mui/icons-material/ViewModule';
-import {
-  Box,
-  Button,
-  Dialog,
-  DialogActions,
-  DialogContent,
-  DialogTitle,
-  Divider,
-  List
-} from '@mui/material';
+import { List } from '@mui/material';

-import { API } from 'api/app';
-
-import { dialogStyle } from 'CustomTheme';
-import { useRequest } from 'alova/client';
-import type { APIcall } from 'app/main/types';
 import { SectionContent, useLayoutTitle } from 'components';
 import ListMenuItem from 'components/layout/ListMenuItem';
+import { AuthenticatedContext } from 'contexts/authentication';
 import { useI18nContext } from 'i18n/i18n-react';

-import SystemMonitor from '../status/SystemMonitor';
-
 const Settings = () => {
  const { LL } = useI18nContext();
+  const { versions } = useContext(AuthenticatedContext);
  useLayoutTitle(LL.SETTINGS(0));

-  const [confirmFactoryReset, setConfirmFactoryReset] = useState(false);
-  const [restarting, setRestarting] = useState<boolean>();
+  const upgradeAvailable = versions?.current?.upgradeable ?? false;
+  const firmwareText = versions?.current?.version
+    ? `v${versions.current.version}${upgradeAvailable ? ` (${LL.UPDATE_AVAILABLE()})` : ''}`
+    : '';

-  const { send: sendAPI } = useRequest((data: APIcall) => API(data), {
-    immediate: false
-  });
+  return (
+    <SectionContent>
+      <List>
+        <ListMenuItem
+          icon={BuildIcon}
+          bgcolor="#72caf9"
+          label="EMS-ESP Firmware"
+          text={firmwareText}
+          to="/settings/version"
+          badge={upgradeAvailable}
+        />

-  const doFormat = useCallback(async () => {
-    await sendAPI({ device: 'system', cmd: 'format', id: 0 }).then(() => {
-      setRestarting(true);
-      setConfirmFactoryReset(false);
-    });
-  }, [sendAPI]);
+        <ListMenuItem
+          icon={TuneIcon}
+          bgcolor="#134ba2"
+          label={LL.APPLICATION()}
+          text={LL.APPLICATION_SETTINGS_1()}
+          to="application"
+        />

-  const handleFactoryResetClose = useCallback(() => {
-    setConfirmFactoryReset(false);
-  }, []);
+        <ListMenuItem
+          icon={SettingsEthernetIcon}
+          bgcolor="#40828f"
+          label={LL.NETWORK(0)}
+          text={LL.CONFIGURE(LL.SETTINGS_OF(LL.NETWORK(1)))}
+          to="network"
+        />

-  const handleFactoryResetClick = useCallback(() => {
-    setConfirmFactoryReset(true);
-  }, []);
+        <ListMenuItem
+          icon={SettingsInputAntennaIcon}
+          bgcolor="#5f9a5f"
+          label={LL.ACCESS_POINT(0)}
+          text={LL.CONFIGURE(LL.ACCESS_POINT(1))}
+          to="ap"
+        />

-  const content = useMemo(() => {
-    return (
-      <>
-        <List>
-          <ListMenuItem
-            icon={TuneIcon}
-            bgcolor="#134ba2"
-            label={LL.APPLICATION()}
-            text={LL.APPLICATION_SETTINGS_1()}
-            to="application"
-          />
+        <ListMenuItem
+          icon={AccessTimeIcon}
+          bgcolor="#c5572c"
+          label="NTP"
+          text={LL.CONFIGURE(LL.LOCAL_TIME(1))}
+          to="ntp"
+        />

-          <ListMenuItem
-            icon={SettingsEthernetIcon}
-            bgcolor="#40828f"
-            label={LL.NETWORK(0)}
-            text={LL.CONFIGURE(LL.SETTINGS_OF(LL.NETWORK(1)))}
-            to="network"
-          />
+        <ListMenuItem
+          icon={DeviceHubIcon}
+          bgcolor="#68374d"
+          label="MQTT"
+          text={LL.CONFIGURE('MQTT')}
+          to="mqtt"
+        />

-          <ListMenuItem
-            icon={SettingsInputAntennaIcon}
-            bgcolor="#5f9a5f"
-            label={LL.ACCESS_POINT(0)}
-            text={LL.CONFIGURE(LL.ACCESS_POINT(1))}
-            to="ap"
-          />
+        <ListMenuItem
+          icon={LockIcon}
+          label={LL.SECURITY(0)}
+          text={LL.SECURITY_1()}
+          to="security"
+        />

-          <ListMenuItem
-            icon={AccessTimeIcon}
-            bgcolor="#c5572c"
-            label="NTP"
-            text={LL.CONFIGURE(LL.LOCAL_TIME(1))}
-            to="ntp"
-          />
+        <ListMenuItem
+          icon={ViewModuleIcon}
+          bgcolor="#efc34b"
+          label={LL.MODULES()}
+          text={LL.MODULES_1()}
+          to="modules"
+        />

-          <ListMenuItem
-            icon={DeviceHubIcon}
-            bgcolor="#68374d"
-            label="MQTT"
-            text={LL.CONFIGURE('MQTT')}
-            to="mqtt"
-          />
-
-          <ListMenuItem
-            icon={LockIcon}
-            label={LL.SECURITY(0)}
-            text={LL.SECURITY_1()}
-            to="security"
-          />
-
-          <ListMenuItem
-            icon={ViewModuleIcon}
-            bgcolor="#efc34b"
-            label={LL.MODULES()}
-            text={LL.MODULES_1()}
-            to="modules"
-          />
-
-          <ListMenuItem
-            icon={ImportExportIcon}
-            bgcolor="#5d89f7"
-            label={LL.DOWNLOAD_UPLOAD()}
-            text={LL.DOWNLOAD_UPLOAD_1()}
-            to="downloadUpload"
-          />
-        </List>
-
-        <Dialog
-          sx={dialogStyle}
-          open={confirmFactoryReset}
-          onClose={handleFactoryResetClose}
-        >
-          <DialogTitle>{LL.FACTORY_RESET()}</DialogTitle>
-          <DialogContent dividers>{LL.SYSTEM_FACTORY_TEXT_DIALOG()}</DialogContent>
-          <DialogActions>
-            <Button
-              startIcon={<CancelIcon />}
-              variant="outlined"
-              onClick={handleFactoryResetClose}
-              color="secondary"
-            >
-              {LL.CANCEL()}
-            </Button>
-            <Button
-              startIcon={<SettingsBackupRestoreIcon />}
-              variant="outlined"
-              onClick={doFormat}
-              color="error"
-            >
-              {LL.FACTORY_RESET()}
-            </Button>
-          </DialogActions>
-        </Dialog>
-
-        <Divider />
-
-        <Box
-          sx={{
-            mt: 2,
-            display: 'flex',
-            justifyContent: 'flex-end',
-            flexWrap: 'nowrap',
-            whiteSpace: 'nowrap'
-          }}
-        >
-          <Button
-            startIcon={<SettingsBackupRestoreIcon />}
-            variant="outlined"
-            onClick={handleFactoryResetClick}
-            color="error"
-          >
-            {LL.FACTORY_RESET()}
-          </Button>
-        </Box>
-      </>
-    );
-  }, [
-    LL,
-    handleFactoryResetClick,
-    handleFactoryResetClose,
-    doFormat,
-    confirmFactoryReset,
-    restarting
-  ]);
-
-  return restarting ? <SystemMonitor /> : <SectionContent>{content}</SectionContent>;
+        <ListMenuItem
+          icon={ImportExportIcon}
+          bgcolor="#5d89f7"
+          label={LL.DOWNLOAD_UPLOAD()}
+          text={LL.DOWNLOAD_UPLOAD_1()}
+          to="downloadUpload"
+        />
+      </List>
+    </SectionContent>
+  );
 };

 export default Settings;
@@ -1,5 +1,3 @@
-import { useMemo } from 'react';
-
 import { MenuItem } from '@mui/material';

 export const TIME_ZONES: Record<string, string> = {
@@ -472,26 +470,16 @@ export function selectedTimeZone(label: string, format: string) {
  return TIME_ZONES[label] === format ? label : undefined;
 }

-// Memoized version for use in components
-export function useTimeZoneSelectItems() {
-  return useMemo(
-    () =>
-      TIME_ZONE_LABELS.map((label) => (
-        <MenuItem key={label} value={label}>
-          {label}
-        </MenuItem>
-      )),
-    []
-  );
-}
-
-// Fallback export for backward compatibility - now memoized
 const precomputedTimeZoneItems = TIME_ZONE_LABELS.map((label) => (
  <MenuItem key={label} value={label}>
    {label}
  </MenuItem>
 ));

+export function useTimeZoneSelectItems() {
+  return precomputedTimeZoneItems;
+}
+
 export function timeZoneSelectItems() {
  return precomputedTimeZoneItems;
 }
@@ -0,0 +1,948 @@
+import { memo, useContext, useEffect, useRef, useState } from 'react';
+import { Link } from 'react-router';
+
+import CancelIcon from '@mui/icons-material/Cancel';
+import CloseIcon from '@mui/icons-material/Close';
+import CheckIcon from '@mui/icons-material/Done';
+import DownloadIcon from '@mui/icons-material/GetApp';
+import InfoOutlinedIcon from '@mui/icons-material/InfoOutlined';
+import PowerSettingsNewIcon from '@mui/icons-material/PowerSettingsNew';
+import SettingsBackupRestoreIcon from '@mui/icons-material/SettingsBackupRestore';
+import WarningIcon from '@mui/icons-material/Warning';
+import {
+  Box,
+  Button,
+  Dialog,
+  DialogActions,
+  DialogContent,
+  DialogTitle,
+  Grid,
+  IconButton,
+  Table,
+  TableBody,
+  TableCell,
+  TableRow,
+  Typography
+} from '@mui/material';
+
+import * as SystemApi from 'api/system';
+import { API, callAction } from 'api/app';
+
+import { dialogStyle } from 'CustomTheme';
+import { useRequest } from 'alova/client';
+import type { APIcall } from 'app/main/types';
+import SystemMonitor from 'app/status/SystemMonitor';
+import {
+  FormLoader,
+  SectionContent,
+  SingleUpload,
+  useLayoutTitle
+} from 'components';
+import { toast } from 'components/toast';
+import { AuthenticatedContext } from 'contexts/authentication';
+import { useI18nContext } from 'i18n/i18n-react';
+import type { TranslationFunctions } from 'i18n/i18n-types';
+import type { VersionInfo } from 'types';
+import { prettyDateTime } from 'utils/time';
+
+// Constants moved outside component to avoid recreation
+const STABLE_URL = 'https://github.com/emsesp/EMS-ESP32/releases/download/';
+const STABLE_RELNOTES_URL =
+  'https://github.com/emsesp/EMS-ESP32/blob/main/CHANGELOG.md';
+const DEV_URL = 'https://github.com/emsesp/EMS-ESP32/releases/download/latest/';
+const DEV_RELNOTES_URL =
+  'https://github.com/emsesp/EMS-ESP32/blob/dev/CHANGELOG_LATEST.md';
+const MAX_VERSION_POLLS = 5; // approx 15 seconds of waiting
+
+// Types for better type safety
+interface PartitionData {
+  partition: string;
+  version: string;
+  install_date?: string;
+  size: number;
+}
+
+interface VersionData {
+  emsesp_version: string;
+  arduino_version: string;
+  esp_platform: string;
+  flash_chip_size: number;
+  psram: boolean;
+  build_flags?: string;
+  partition: string;
+  partitions: PartitionData[];
+  developer_mode: boolean;
+  disable_reset: boolean;
+}
+
+// Memoized components for better performance
+const VersionInfoDialog = memo(
+  ({
+    showVersionInfo,
+    latestVersion,
+    latestDevVersion,
+    partitionVersion,
+    partition,
+    currentPartition,
+    size,
+    locale,
+    LL,
+    onClose
+  }: {
+    showVersionInfo: number;
+    latestVersion: VersionInfo | undefined;
+    latestDevVersion: VersionInfo | undefined;
+    partitionVersion: VersionInfo | undefined;
+    partition: string;
+    currentPartition: string;
+    size: number;
+    locale: string;
+    LL: TranslationFunctions;
+    onClose: () => void;
+  }) => {
+    if (showVersionInfo === 0) return null;
+
+    const isStable = showVersionInfo === 1;
+    const isDev = showVersionInfo === 2;
+    const isPartition = showVersionInfo === 3;
+
+    const version = isStable
+      ? latestVersion
+      : isDev
+        ? latestDevVersion
+        : partitionVersion;
+    const relNotesUrl = isStable
+      ? STABLE_RELNOTES_URL
+      : isDev
+        ? DEV_RELNOTES_URL
+        : '';
+
+    return (
+      <Dialog sx={dialogStyle} open={showVersionInfo !== 0} onClose={onClose}>
+        <DialogTitle>{LL.FIRMWARE_VERSION_INFO()}</DialogTitle>
+        <DialogContent dividers>
+          <Table size="small" sx={{ borderCollapse: 'collapse', minWidth: 0 }}>
+            <TableBody>
+              <TableRow sx={{ height: 24, borderBottom: 'none' }}>
+                <TableCell
+                  component="th"
+                  scope="row"
+                  sx={{
+                    color: 'lightblue',
+                    borderBottom: 'none',
+                    pr: 1,
+                    py: 0.5,
+                    fontSize: 13
+                  }}
+                >
+                  {LL.VERSION()}
+                </TableCell>
+                <TableCell sx={{ borderBottom: 'none', py: 0.5, fontSize: 13 }}>
+                  {isPartition
+                    ? typeof version === 'string'
+                      ? version
+                      : version?.version
+                    : version?.version}
+                </TableCell>
+              </TableRow>
+              <TableRow sx={{ height: 24, borderBottom: 'none' }}>
+                <TableCell
+                  component="th"
+                  scope="row"
+                  sx={{
+                    color: 'lightblue',
+                    borderBottom: 'none',
+                    pr: 1,
+                    py: 0.5,
+                    fontSize: 13,
+                    width: 140
+                  }}
+                >
+                  {isPartition ? LL.TYPE(0) : LL.RELEASE_TYPE()}
+                </TableCell>
+                <TableCell sx={{ borderBottom: 'none', py: 0.5, fontSize: 13 }}>
+                  {partition === currentPartition && LL.ACTIVE() + ' '}
+                  {isStable
+                    ? LL.STABLE()
+                    : isDev
+                      ? LL.DEVELOPMENT()
+                      : 'Partition ' + LL.VERSION()}
+                </TableCell>
+              </TableRow>
+              {isPartition && (
+                <TableRow sx={{ height: 24, borderBottom: 'none' }}>
+                  <TableCell
+                    component="th"
+                    scope="row"
+                    sx={{
+                      color: 'lightblue',
+                      borderBottom: 'none',
+                      pr: 1,
+                      py: 0.5,
+                      fontSize: 13
+                    }}
+                  >
+                    Partition
+                  </TableCell>
+                  <TableCell sx={{ borderBottom: 'none', py: 0.5, fontSize: 13 }}>
+                    {partition}
+                  </TableCell>
+                </TableRow>
+              )}
+              {isPartition && (
+                <TableRow sx={{ height: 24, borderBottom: 'none' }}>
+                  <TableCell
+                    component="th"
+                    scope="row"
+                    sx={{
+                      color: 'lightblue',
+                      borderBottom: 'none',
+                      pr: 1,
+                      py: 0.5,
+                      fontSize: 13
+                    }}
+                  >
+                    Size
+                  </TableCell>
+                  <TableCell sx={{ borderBottom: 'none', py: 0.5, fontSize: 13 }}>
+                    {size} KB
+                  </TableCell>
+                </TableRow>
+              )}
+              {version && version.date && (
+                <TableRow sx={{ height: 24, borderBottom: 'none' }}>
+                  <TableCell
+                    component="th"
+                    scope="row"
+                    sx={{
+                      color: 'lightblue',
+                      borderBottom: 'none',
+                      pr: 1,
+                      py: 0.5,
+                      fontSize: 13
+                    }}
+                  >
+                    {isPartition ? 'Install Date' : 'Build Date'}
+                  </TableCell>
+                  <TableCell sx={{ borderBottom: 'none', py: 0.5, fontSize: 13 }}>
+                    {prettyDateTime(locale, new Date(version.date))}
+                  </TableCell>
+                </TableRow>
+              )}
+            </TableBody>
+          </Table>
+        </DialogContent>
+        <DialogActions>
+          {!isPartition && (
+            <Button
+              variant="outlined"
+              component="a"
+              href={relNotesUrl}
+              target="_blank"
+              color="primary"
+            >
+              Changelog
+            </Button>
+          )}
+          <Button variant="outlined" onClick={onClose} color="secondary">
+            {LL.CLOSE()}
+          </Button>
+        </DialogActions>
+      </Dialog>
+    );
+  }
+);
+
+const InstallDialog = memo(
+  ({
+    openInstallDialog,
+    fetchDevVersion,
+    latestVersion,
+    latestDevVersion,
+    upgradeImportantMessageType,
+    platform,
+    LL,
+    onClose,
+    onInstall
+  }: {
+    openInstallDialog: boolean;
+    fetchDevVersion: boolean;
+    latestVersion: VersionInfo | undefined;
+    latestDevVersion: VersionInfo | undefined;
+    upgradeImportantMessageType: number;
+    platform: string;
+    LL: TranslationFunctions;
+    onClose: () => void;
+    onInstall: (url: string) => void;
+  }) => {
+    const binURL = (() => {
+      if (!latestVersion || !latestDevVersion) return '';
+      const version = fetchDevVersion ? latestDevVersion : latestVersion;
+      const filename = `EMS-ESP-${version.version.replaceAll('.', '_')}-${platform}.bin`;
+      return fetchDevVersion
+        ? `${DEV_URL}${filename}`
+        : `${STABLE_URL}v${version.version}/${filename}`;
+    })();
+
+    return (
+      <Dialog sx={dialogStyle} open={openInstallDialog} onClose={onClose}>
+        <DialogTitle>
+          {`${LL.INSTALL()} ${fetchDevVersion ? LL.DEVELOPMENT() : LL.STABLE()} Firmware`}
+        </DialogTitle>
+        <DialogContent dividers>
+          <Typography sx={{ mb: 2 }}>
+            {LL.INSTALL_VERSION(
+              LL.INSTALL(),
+              fetchDevVersion ? latestDevVersion?.version : latestVersion?.version
+            )}
+          </Typography>
+          {upgradeImportantMessageType === 2 && LL.UPGRADE_IMPORTANT_MESSAGES_2()}
+          {upgradeImportantMessageType === 1 && LL.UPGRADE_IMPORTANT_MESSAGES_1()}
+          <Typography sx={{ mt: 2 }}>
+            <Link to="/settings/downloadUpload" style={{ color: 'lightblue' }}>
+              {LL.DOWNLOAD_SYSTEM_BACKUP()}
+            </Link>
+          </Typography>
+          <Typography sx={{ mt: 2 }}>
+            <Link
+              to="https://docs.emsesp.org/FAQ#upgrading-the-firmware"
+              target="_blank"
+              rel="noreferrer"
+              style={{ color: 'lightblue' }}
+            >
+              {LL.ONLINE_HELP()}
+            </Link>
+          </Typography>
+        </DialogContent>
+        <DialogActions>
+          <Button
+            startIcon={<CancelIcon />}
+            variant="outlined"
+            onClick={onClose}
+            color="secondary"
+          >
+            {LL.CANCEL()}
+          </Button>
+          <Button
+            startIcon={<DownloadIcon />}
+            variant="outlined"
+            onClick={onClose}
+            color="primary"
+          >
+            <Link
+              to={binURL}
+              target="_blank"
+              rel="noreferrer"
+              style={{ color: 'lightblue', textDecoration: 'none' }}
+            >
+              {LL.DOWNLOAD(0)}
+            </Link>
+          </Button>
+          <Button
+            startIcon={<WarningIcon color="warning" />}
+            variant="outlined"
+            onClick={() => onInstall(binURL)}
+            color="primary"
+          >
+            {LL.INSTALL()}
+          </Button>
+        </DialogActions>
+      </Dialog>
+    );
+  }
+);
+
+const InstallPartitionDialog = memo(
+  ({
+    openInstallPartitionDialog,
+    version,
+    partition,
+    LL,
+    onClose,
+    onInstall
+  }: {
+    openInstallPartitionDialog: boolean;
+    version: string;
+    partition: string;
+    LL: TranslationFunctions;
+    onClose: () => void;
+    onInstall: (partition: string) => void;
+  }) => {
+    return (
+      <Dialog sx={dialogStyle} open={openInstallPartitionDialog} onClose={onClose}>
+        <DialogTitle>
+          {LL.INSTALL()} {LL.STORED_VERSIONS()}
+        </DialogTitle>
+        <DialogContent dividers>
+          <Typography sx={{ mb: 2 }}>
+            {LL.INSTALL_VERSION(LL.INSTALL(), version)}
+          </Typography>
+        </DialogContent>
+        <DialogActions>
+          <Button
+            startIcon={<CancelIcon />}
+            variant="outlined"
+            onClick={onClose}
+            color="secondary"
+          >
+            {LL.CANCEL()}
+          </Button>
+
+          <Button
+            startIcon={<WarningIcon color="warning" />}
+            variant="outlined"
+            onClick={() => onInstall(partition)}
+            color="primary"
+          >
+            {LL.INSTALL()}
+          </Button>
+        </DialogActions>
+      </Dialog>
+    );
+  }
+);
+
+// Helper function moved outside component
+const getPlatform = (data: VersionData): string => {
+  return `${data.esp_platform}-${data.flash_chip_size >= 16384 ? '16MB' : '4MB'}${data.psram ? '+' : ''}`;
+};
+
+const Version = () => {
+  const { LL, locale } = useI18nContext();
+  const { me, versions, refreshVersions } = useContext(AuthenticatedContext);
+
+  const [restarting, setRestarting] = useState<boolean>(false);
+  const [confirmFactoryReset, setConfirmFactoryReset] = useState<boolean>(false);
+  const [confirmRestart, setConfirmRestart] = useState<boolean>(false);
+  const [openInstallDialog, setOpenInstallDialog] = useState<boolean>(false);
+
+  const [partitionVersion, setPartitionVersion] = useState<VersionInfo | undefined>(
+    undefined
+  );
+  const [partition, setPartition] = useState<string>('');
+  const [openInstallPartitionDialog, setOpenInstallPartitionDialog] =
+    useState<boolean>(false);
+
+  const [fetchDevVersion, setFetchDevVersion] = useState<boolean>(false);
+  const [showVersionInfo, setShowVersionInfo] = useState<number>(0); // 1 = stable, 2 = dev, 3 = partition
+  const [firmwareSize, setFirmwareSize] = useState<number>(0);
+
+  const latestVersion: VersionInfo | undefined = versions?.stable
+    ? { version: versions.stable.version, date: versions.stable.date }
+    : undefined;
+  const latestDevVersion: VersionInfo | undefined = versions?.dev
+    ? { version: versions.dev.version, date: versions.dev.date }
+    : undefined;
+  const usingDevVersion = versions?.current?.type === 'dev';
+  const stableUpgradeAvailable = versions?.stable?.upgradeable ?? false;
+  const devUpgradeAvailable = versions?.dev?.upgradeable ?? false;
+  const internetLive = Boolean(versions?.stable || versions?.dev);
+  const versionPolls = useRef(0);
+
+  useEffect(() => {
+    if (internetLive || versionPolls.current >= MAX_VERSION_POLLS) {
+      return;
+    }
+    const interval = setInterval(() => {
+      versionPolls.current += 1;
+      if (versionPolls.current >= MAX_VERSION_POLLS) {
+        clearInterval(interval);
+      }
+      void refreshVersions();
+    }, 3000);
+    return () => clearInterval(interval);
+  }, [internetLive, refreshVersions]);
+
+  const { send: sendSetPartition } = useRequest(
+    (partition: string) => callAction({ action: 'setPartition', param: partition }),
+    { immediate: false }
+  ).onError((error) => {
+    toast.error(String(error.error?.message || 'An error occurred'));
+  });
+
+  const { data, send: loadData, error } = useRequest(SystemApi.readSystemStatus);
+
+  const { send: sendUploadURL } = useRequest(
+    (url: string) => callAction({ action: 'uploadURL', param: url }),
+    { immediate: false }
+  );
+
+  const { send: sendAPI } = useRequest((data: APIcall) => API(data), {
+    immediate: false
+  });
+
+  const [upgradeImportantMessageType, setUpgradeImportantMessageType] =
+    useState<number>(0);
+
+  const { send: checkUpgradeImportantMessages } = useRequest(
+    (version: string) =>
+      callAction({ action: 'upgradeImportantMessages', param: version }),
+    {
+      immediate: false
+    }
+  )
+    .onSuccess((event) => {
+      const upgradeImportantMessageType_n = (
+        event.data as { upgradeImportantMessageType: number }
+      ).upgradeImportantMessageType;
+      setUpgradeImportantMessageType(upgradeImportantMessageType_n);
+    })
+    .onError((error) => {
+      toast.error(String(error.error?.message || 'An error occurred'));
+    });
+
+  const platform = data ? getPlatform(data) : '';
+
+  const otherPartitions =
+    data?.partitions.filter((p) => p.partition !== data.partition) ?? [];
+
+  const setPartitionVersionInfo = (partition: string) => {
+    setShowVersionInfo(3);
+    const partitionData = data?.partitions.find((p) => p.partition === partition);
+    if (partitionData) {
+      setPartitionVersion({
+        version: partitionData.version,
+        date: partitionData.install_date ?? ''
+      });
+      setPartition(partitionData.partition);
+      setFirmwareSize(partitionData.size);
+    }
+  };
+
+  const doRestart = async () => {
+    setConfirmRestart(false);
+    await sendAPI({ device: 'system', cmd: 'restart', id: 0 }).catch(
+      (error: Error) => {
+        toast.error(error.message);
+      }
+    );
+    setRestarting(true);
+  };
+
+  const doFormat = async () => {
+    await sendAPI({ device: 'system', cmd: 'format', id: 0 }).then(() => {
+      setRestarting(true);
+      setConfirmFactoryReset(false);
+    });
+  };
+
+  const handleFactoryResetClose = () => setConfirmFactoryReset(false);
+  const handleFactoryResetClick = () => setConfirmFactoryReset(true);
+  const handleRestartClose = () => setConfirmRestart(false);
+  const handleRestartClick = () => setConfirmRestart(true);
+
+  const installFirmwareURL = async (url: string) => {
+    await sendUploadURL(url).catch((error: Error) => {
+      toast.error(error.message);
+    });
+    await doRestart();
+  };
+
+  const installPartitionFirmware = async (partition: string) => {
+    await sendSetPartition(partition).catch((error: Error) => {
+      toast.error(error.message);
+    });
+    setRestarting(true);
+  };
+
+  const showPartitionDialog = (
+    version: string,
+    partition: string,
+    install_date: string
+  ) => {
+    setOpenInstallPartitionDialog(true);
+    setPartitionVersion({ version: version, date: install_date });
+    setPartition(partition);
+  };
+
+  const showFirmwareDialog = (useDevVersion: boolean) => {
+    setFetchDevVersion(useDevVersion);
+    const targetVersion = useDevVersion
+      ? latestDevVersion?.version
+      : latestVersion?.version;
+    if (targetVersion) {
+      void checkUpgradeImportantMessages(targetVersion);
+    }
+    setOpenInstallDialog(true);
+  };
+
+  const closeInstallDialog = () => setOpenInstallDialog(false);
+  const closeInstallPartitionDialog = () => setOpenInstallPartitionDialog(false);
+
+  const handleVersionInfoClose = () => {
+    setShowVersionInfo(0);
+    setPartitionVersion(undefined);
+    setPartition('');
+  };
+
+  useLayoutTitle('EMS-ESP Firmware');
+
+  const showButtons = (showingDev: boolean) => {
+    const choice = showingDev
+      ? !usingDevVersion
+        ? LL.SWITCH_RELEASE_TYPE(LL.DEVELOPMENT())
+        : devUpgradeAvailable
+          ? LL.UPDATE_AVAILABLE()
+          : undefined
+      : usingDevVersion
+        ? LL.SWITCH_RELEASE_TYPE(LL.STABLE())
+        : stableUpgradeAvailable
+          ? LL.UPDATE_AVAILABLE()
+          : undefined;
+
+    if (!choice) {
+      return (
+        <>
+          <CheckIcon
+            color="success"
+            sx={{ verticalAlign: 'middle', ml: 0.5, mr: 0.5 }}
+          />
+          <span style={{ color: '#66bb6a', fontSize: '0.8em' }}>
+            {LL.LATEST_VERSION(usingDevVersion ? LL.DEVELOPMENT() : LL.STABLE())}
+          </span>
+          <Button
+            sx={{ ml: 1 }}
+            variant="outlined"
+            size="small"
+            onClick={() => showFirmwareDialog(showingDev)}
+          >
+            {LL.REINSTALL()}
+          </Button>
+        </>
+      );
+    }
+
+    if (!me.admin) return null;
+
+    const isUpdateAvailable = choice === LL.UPDATE_AVAILABLE();
+
+    return (
+      <Button
+        sx={{ ml: 1 }}
+        variant="outlined"
+        color={isUpdateAvailable ? 'success' : 'warning'}
+        size="small"
+        onClick={() => showFirmwareDialog(showingDev)}
+      >
+        {choice}
+        {isUpdateAvailable && (
+          <Box
+            component="span"
+            aria-label="update available"
+            sx={{
+              display: 'inline-block',
+              width: 8,
+              height: 8,
+              ml: 1,
+              verticalAlign: 'middle',
+              borderRadius: '50%',
+              backgroundColor: '#ffeb3b',
+              boxShadow: '0 0 6px rgba(255, 235, 59, 0.8)'
+            }}
+          />
+        )}
+      </Button>
+    );
+  };
+
+  if (restarting) {
+    return <SystemMonitor />;
+  }
+
+  if (!data) {
+    return (
+      <SectionContent>
+        <FormLoader onRetry={loadData} errorMessage={error?.message || ''} />
+      </SectionContent>
+    );
+  }
+
+  return (
+    <SectionContent>
+      <Box sx={{ p: 2, border: '1px solid #565656', borderRadius: 2 }}>
+        <Typography sx={{ mb: 1 }} variant="h6" color="primary">
+          {LL.THIS_VERSION()}
+        </Typography>
+
+        <Grid
+          container
+          direction="row"
+          sx={{
+            justifyContent: 'flex-start',
+            alignItems: 'baseline'
+          }}
+        >
+          <Grid size={{ xs: 4, md: 2 }}>
+            <Typography color="secondary">{LL.VERSION()}</Typography>
+          </Grid>
+          <Grid size={{ xs: 8, md: 10 }}>
+            <Typography>
+              {data.emsesp_version}
+              {data.build_flags && (
+                <Typography variant="caption">
+                  &nbsp; &#40;{data.build_flags}&#41;
+                </Typography>
+              )}
+              <IconButton
+                onClick={() => setPartitionVersionInfo(data.partition)}
+                aria-label={LL.FIRMWARE_VERSION_INFO()}
+              >
+                <InfoOutlinedIcon color="primary" sx={{ fontSize: 18 }} />
+              </IconButton>
+            </Typography>
+          </Grid>
+
+          <Grid size={{ xs: 4, md: 2 }}>
+            <Typography color="secondary">{LL.PLATFORM()}</Typography>
+          </Grid>
+          <Grid size={{ xs: 8, md: 10 }}>
+            <Typography>
+              {platform}
+              <Typography variant="caption">
+                &nbsp; &#40;
+                {data.psram ? (
+                  <CheckIcon
+                    color="success"
+                    sx={{
+                      fontSize: '1.5em',
+                      verticalAlign: 'middle'
+                    }}
+                  />
+                ) : (
+                  <CloseIcon
+                    color="error"
+                    sx={{
+                      fontSize: '1.5em',
+                      verticalAlign: 'middle'
+                    }}
+                  />
+                )}
+                PSRAM&#41;
+              </Typography>
+            </Typography>
+          </Grid>
+        </Grid>
+
+        {internetLive ? (
+          <>
+            <Typography sx={{ mt: 4, mb: 1 }} variant="h6" color="primary">
+              {LL.AVAILABLE_VERSION()}
+            </Typography>
+
+            <Grid
+              container
+              direction="row"
+              rowSpacing={1}
+              sx={{
+                justifyContent: 'flex-start',
+                alignItems: 'baseline'
+              }}
+            >
+              {otherPartitions.length > 0 && data.developer_mode && (
+                <>
+                  <Grid size={{ xs: 4, md: 2 }}>
+                    <Typography color="secondary">{LL.STORED_VERSIONS()}</Typography>
+                  </Grid>
+                  <Grid size={{ xs: 8, md: 10 }}>
+                    {otherPartitions.map((partition) => (
+                      <Typography key={partition.partition} sx={{ mb: 1 }}>
+                        {partition.version}
+                        <IconButton
+                          onClick={() =>
+                            setPartitionVersionInfo(partition.partition)
+                          }
+                          aria-label={LL.FIRMWARE_VERSION_INFO()}
+                        >
+                          <InfoOutlinedIcon color="primary" sx={{ fontSize: 18 }} />
+                        </IconButton>
+                        <Button
+                          sx={{ ml: 0 }}
+                          variant="outlined"
+                          size="small"
+                          onClick={() =>
+                            showPartitionDialog(
+                              partition.version,
+                              partition.partition,
+                              partition.install_date ?? ''
+                            )
+                          }
+                        >
+                          {LL.INSTALL()}
+                        </Button>
+                      </Typography>
+                    ))}
+                  </Grid>
+                </>
+              )}
+              <Grid size={{ xs: 4, md: 2 }}>
+                <Typography color="secondary">{LL.STABLE()}</Typography>
+              </Grid>
+              <Grid size={{ xs: 8, md: 10 }}>
+                <Typography>
+                  {latestVersion?.version}
+                  <IconButton
+                    onClick={() => setShowVersionInfo(1)}
+                    aria-label={LL.FIRMWARE_VERSION_INFO()}
+                  >
+                    <InfoOutlinedIcon color="primary" sx={{ fontSize: 18 }} />
+                  </IconButton>
+                  {showButtons(false)}
+                </Typography>
+              </Grid>
+
+              <Grid size={{ xs: 4, md: 2 }}>
+                <Typography color="secondary">{LL.DEVELOPMENT()}</Typography>
+              </Grid>
+              <Grid size={{ xs: 8, md: 10 }}>
+                <Typography>
+                  {latestDevVersion?.version}
+                  <IconButton
+                    onClick={() => setShowVersionInfo(2)}
+                    aria-label={LL.FIRMWARE_VERSION_INFO()}
+                  >
+                    <InfoOutlinedIcon color="primary" sx={{ fontSize: 18 }} />
+                  </IconButton>
+                  {showButtons(true)}
+                </Typography>
+              </Grid>
+            </Grid>
+          </>
+        ) : (
+          <Typography sx={{ mt: 2 }} color="warning">
+            {LL.INTERNET_CONNECTION_CHECK()}&hellip;
+          </Typography>
+        )}
+        {me.admin && (
+          <>
+            <VersionInfoDialog
+              showVersionInfo={showVersionInfo}
+              latestVersion={latestVersion}
+              latestDevVersion={latestDevVersion}
+              partitionVersion={partitionVersion}
+              locale={locale}
+              partition={partition}
+              currentPartition={data?.partition ?? ''}
+              size={firmwareSize}
+              LL={LL}
+              onClose={handleVersionInfoClose}
+            />
+            <InstallDialog
+              openInstallDialog={openInstallDialog}
+              fetchDevVersion={fetchDevVersion}
+              latestVersion={latestVersion}
+              latestDevVersion={latestDevVersion}
+              upgradeImportantMessageType={upgradeImportantMessageType}
+              platform={platform}
+              LL={LL}
+              onClose={closeInstallDialog}
+              onInstall={installFirmwareURL}
+            />
+            <InstallPartitionDialog
+              openInstallPartitionDialog={openInstallPartitionDialog}
+              version={partitionVersion?.version || ''}
+              partition={partition}
+              LL={LL}
+              onClose={closeInstallPartitionDialog}
+              onInstall={installPartitionFirmware}
+            />
+            <Typography sx={{ pt: 2, pb: 2 }} variant="h6" color="primary">
+              {LL.UPLOAD()}
+            </Typography>
+            <SingleUpload text={LL.UPLOAD_FIRMWARE_TEXT()} doRestart={doRestart} />
+          </>
+        )}
+      </Box>
+
+      {me.admin && (
+        <>
+          <Dialog
+            sx={dialogStyle}
+            open={confirmFactoryReset}
+            onClose={handleFactoryResetClose}
+          >
+            <DialogTitle>{LL.FACTORY_RESET()}</DialogTitle>
+            <DialogContent dividers>{LL.SYSTEM_FACTORY_TEXT_DIALOG()}</DialogContent>
+            <DialogActions>
+              <Button
+                startIcon={<CancelIcon />}
+                variant="outlined"
+                onClick={handleFactoryResetClose}
+                color="secondary"
+              >
+                {LL.CANCEL()}
+              </Button>
+              <Button
+                startIcon={<SettingsBackupRestoreIcon />}
+                variant="outlined"
+                onClick={doFormat}
+                color="error"
+              >
+                {LL.FACTORY_RESET()}
+              </Button>
+            </DialogActions>
+          </Dialog>
+
+          <Dialog
+            sx={dialogStyle}
+            open={confirmRestart}
+            onClose={handleRestartClose}
+          >
+            <DialogTitle>{LL.RESTART()}</DialogTitle>
+            <DialogContent dividers>{LL.RESTART_CONFIRM()}</DialogContent>
+            <DialogActions>
+              <Button
+                startIcon={<CancelIcon />}
+                variant="outlined"
+                onClick={handleRestartClose}
+                color="secondary"
+              >
+                {LL.CANCEL()}
+              </Button>
+              <Button
+                startIcon={<PowerSettingsNewIcon />}
+                variant="outlined"
+                onClick={doRestart}
+                color="success"
+              >
+                {LL.RESTART()}
+              </Button>
+            </DialogActions>
+          </Dialog>
+
+          <Box
+            sx={{
+              mt: 2,
+              display: 'flex',
+              justifyContent: 'space-between',
+              alignItems: 'center',
+              flexWrap: 'nowrap',
+              whiteSpace: 'nowrap',
+              gap: 1
+            }}
+          >
+            {!data.disable_reset && (
+              <Button
+                startIcon={<SettingsBackupRestoreIcon />}
+                variant="outlined"
+                onClick={handleFactoryResetClick}
+                color="error"
+              >
+                {LL.FACTORY_RESET()}
+              </Button>
+            )}
+            <Button
+              startIcon={<PowerSettingsNewIcon />}
+              variant="outlined"
+              onClick={handleRestartClick}
+              color="success"
+            >
+              {LL.RESTART()}
+            </Button>
+          </Box>
+        </>
+      )}
+    </SectionContent>
+  );
+};
+
+export default memo(Version);
@@ -1,12 +1,5 @@
-import { memo, useCallback, useMemo, useState } from 'react';
-import {
-  Navigate,
-  Route,
-  Routes,
-  matchRoutes,
-  useLocation,
-  useNavigate
-} from 'react-router';
+import { memo, useState } from 'react';
+import { Outlet, useMatch, useNavigate } from 'react-router';

 import { Tab } from '@mui/material';

@@ -14,52 +7,32 @@ import { RouterTabs, useLayoutTitle } from 'components';
 import { useI18nContext } from 'i18n/i18n-react';
 import type { WiFiNetwork } from 'types';

-import NetworkSettings from './NetworkSettings';
 import { WiFiConnectionContext } from './WiFiConnectionContext';
-import WiFiNetworkScanner from './WiFiNetworkScanner';

 const Network = () => {
  const { LL } = useI18nContext();
  useLayoutTitle(LL.NETWORK(0));

-  // this also works!
-  // const routerTab = useMatch(`settings/network/:path/*`)?.pathname || false;
-  const matchedRoutes = matchRoutes(
-    [
-      {
-        path: '/settings/network/settings',
-        element: <NetworkSettings />
-      },
-      { path: '/settings/network/scan', element: <WiFiNetworkScanner /> }
-    ],
-    useLocation()
-  );
-  const routerTab = matchedRoutes?.[0]?.route.path || false;
+  const routerTab = useMatch('/settings/network/:tab')?.pathname || false;

  const navigate = useNavigate();

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

-  const selectNetwork = useCallback(
-    (network: WiFiNetwork) => {
-      setSelectedNetwork(network);
-      void navigate('/settings/network/settings');
-    },
-    [navigate]
-  );
+  const selectNetwork = (network: WiFiNetwork) => {
+    setSelectedNetwork(network);
+    void navigate('/settings/network/settings');
+  };

-  const deselectNetwork = useCallback(() => {
+  const deselectNetwork = () => {
    setSelectedNetwork(undefined);
-  }, []);
+  };

-  const contextValue = useMemo(
-    () => ({
-      ...(selectedNetwork && { selectedNetwork }),
-      selectNetwork,
-      deselectNetwork
-    }),
-    [selectedNetwork, selectNetwork, deselectNetwork]
-  );
+  const contextValue = {
+    ...(selectedNetwork && { selectedNetwork }),
+    selectNetwork,
+    deselectNetwork
+  };

  return (
    <WiFiConnectionContext.Provider value={contextValue}>
@@ -70,14 +43,7 @@ const Network = () => {
        />
        <Tab value="/settings/network/scan" label={LL.NETWORK_SCAN()} />
      </RouterTabs>
-      <Routes>
-        <Route path="scan" element={<WiFiNetworkScanner />} />
-        <Route path="settings" element={<NetworkSettings />} />
-        <Route
-          path="*"
-          element={<Navigate replace to="/settings/network/settings" />}
-        />
-      </Routes>
+      <Outlet />
    </WiFiConnectionContext.Provider>
  );
 };
@@ -1,5 +1,4 @@
 import { memo, useCallback, useContext, useEffect, useState } from 'react';
-import { toast } from 'react-toastify';

 import CancelIcon from '@mui/icons-material/Cancel';
 import DeleteIcon from '@mui/icons-material/Delete';
@@ -23,10 +22,10 @@ import {

 import * as NetworkApi from 'api/network';
 import { API } from 'api/app';
+import { readSystemStatus } from 'api/system';

 import { updateState, useRequest } from 'alova/client';
 import type { APIcall } from 'app/main/types';
-import type { ValidateFieldsError } from 'async-validator';
 import {
  BlockFormControlLabel,
  BlockNavigation,
@@ -37,11 +36,13 @@ import {
  ValidatedPasswordField,
  ValidatedTextField
 } from 'components';
+import { toast } from 'components/toast';
 import { useI18nContext } from 'i18n/i18n-react';
 import type { NetworkSettingsType } from 'types';
 import { updateValueDirty, useRest } from 'utils';
 import { ValidationError, validate } from 'validators';
 import { createNetworkSettingsValidator } from 'validators/network';
+import type { ValidateFieldsError } from 'validators/schema';

 import SystemMonitor from '../../status/SystemMonitor';
 import { WiFiConnectionContext } from './WiFiConnectionContext';
@@ -50,6 +51,8 @@ import { isNetworkOpen, networkSecurityMode } from './WiFiNetworkSelector';
 const NetworkSettings = () => {
  const { LL } = useI18nContext();

+  const { data: hardwareData } = useRequest(readSystemStatus);
+
  const { selectedNetwork, deselectNetwork } = useContext(WiFiConnectionContext);

  const [initialized, setInitialized] = useState(false);
@@ -89,10 +92,11 @@ const NetworkSettings = () => {
            static_ip_config: false,
            bandwidth20: false,
            tx_power: 0,
-            nosleep: false,
+            nosleep: true,
            enableMDNS: true,
            enableCORS: false,
-            CORSOrigin: '*'
+            CORSOrigin: '*',
+            eth_10mbit: current_data ? current_data.eth_10mbit : false
          })
        );
      }
@@ -121,22 +125,22 @@ const NetworkSettings = () => {
    deselectNetwork();
  }, [data, saveData, deselectNetwork]);

-  const setCancel = useCallback(async () => {
+  const setCancel = async () => {
    deselectNetwork();
    await loadData();
-  }, [deselectNetwork, loadData]);
+  };

-  const doRestart = useCallback(async () => {
+  const doRestart = async () => {
    setRestarting(true);
    await sendAPI({ device: 'system', cmd: 'restart', id: 0 }).catch(
      (error: Error) => {
        toast.error(error.message);
      }
    );
-  }, [sendAPI]);
+  };

  const content = () => {
-    if (!data) {
+    if (!data || !hardwareData) {
      return <FormLoader onRetry={loadData} errorMessage={errorMessage || ''} />;
    }

@@ -173,7 +177,7 @@ const NetworkSettings = () => {
          <ValidatedTextField
            fieldErrors={fieldErrors || {}}
            name="ssid"
-            label={'SSID (' + LL.NETWORK_BLANK_SSID() + ')'}
+            label="SSID"
            fullWidth
            variant="outlined"
            value={data.ssid}
@@ -246,6 +250,23 @@ const NetworkSettings = () => {
          }
          label={LL.NETWORK_LOW_BAND()}
        />
+        {hardwareData.esp_platform === 'ESP32' && (
+          <>
+            <Typography sx={{ pt: 2 }} variant="h6" color="primary">
+              Ethernet
+            </Typography>
+            <BlockFormControlLabel
+              control={
+                <Checkbox
+                  name="eth_10mbit"
+                  checked={data.eth_10mbit}
+                  onChange={updateFormValue}
+                />
+              }
+              label="Force 10Mbit half-duplex"
+            />
+          </>
+        )}
        <Typography sx={{ pt: 2 }} variant="h6" color="primary">
          {LL.GENERAL_OPTIONS()}
        </Typography>
@@ -1,4 +1,4 @@
-import { memo, useCallback, useRef, useState } from 'react';
+import { memo, useRef, useState } from 'react';

 import PermScanWifiIcon from '@mui/icons-material/PermScanWifi';
 import { Button } from '@mui/material';
@@ -48,12 +48,12 @@ const WiFiNetworkScanner = () => {
    }
  });

-  const renderNetworkScanner = useCallback(() => {
+  const renderNetworkScanner = () => {
    if (!networkList) {
      return <FormLoader errorMessage={errorMessage || ''} />;
    }
    return <WiFiNetworkSelector networkList={networkList} />;
-  }, [networkList, errorMessage]);
+  };

  return (
    <SectionContent>
@@ -1,4 +1,4 @@
-import { memo, useCallback, useContext } from 'react';
+import { memo, useContext } from 'react';

 import LockIcon from '@mui/icons-material/Lock';
 import LockOpenIcon from '@mui/icons-material/LockOpen';
@@ -63,34 +63,31 @@ const WiFiNetworkSelector = ({ networkList }: { networkList: WiFiNetworkList })

  const wifiConnectionContext = useContext(WiFiConnectionContext);

-  const renderNetwork = useCallback(
-    (network: WiFiNetwork) => (
-      <ListItem
-        key={network.bssid}
-        onClick={() => wifiConnectionContext.selectNetwork(network)}
-      >
-        <ListItemAvatar>
-          <Avatar>{isNetworkOpen(network) ? <LockOpenIcon /> : <LockIcon />}</Avatar>
-        </ListItemAvatar>
-        <ListItemText
-          primary={network.ssid}
-          secondary={
-            'Security: ' +
-            networkSecurityMode(network) +
-            ', Ch: ' +
-            network.channel +
-            ', bssid: ' +
-            network.bssid
-          }
-        />
-        <ListItemIcon>
-          <Badge badgeContent={network.rssi + 'dBm'}>
-            <WifiIcon sx={{ color: networkQualityHighlight(network, theme) }} />
-          </Badge>
-        </ListItemIcon>
-      </ListItem>
-    ),
-    [wifiConnectionContext, theme]
+  const renderNetwork = (network: WiFiNetwork) => (
+    <ListItem
+      key={network.bssid}
+      onClick={() => wifiConnectionContext.selectNetwork(network)}
+    >
+      <ListItemAvatar>
+        <Avatar>{isNetworkOpen(network) ? <LockOpenIcon /> : <LockIcon />}</Avatar>
+      </ListItemAvatar>
+      <ListItemText
+        primary={network.ssid}
+        secondary={
+          'Security: ' +
+          networkSecurityMode(network) +
+          ', Ch: ' +
+          network.channel +
+          ', bssid: ' +
+          network.bssid
+        }
+      />
+      <ListItemIcon>
+        <Badge badgeContent={network.rssi + 'dBm'}>
+          <WifiIcon sx={{ color: networkQualityHighlight(network, theme) }} />
+        </Badge>
+      </ListItemIcon>
+    </ListItem>
  );

  if (networkList.networks.length === 0) {
@@ -1,4 +1,4 @@
-import { memo, useCallback, useContext, useMemo, useState } from 'react';
+import { memo, useCallback, useContext, useState } from 'react';
 import { useBlocker } from 'react-router';

 import CancelIcon from '@mui/icons-material/Cancel';
@@ -55,16 +55,14 @@ const ManageUsers = () => {
  const blocker = useBlocker(changed !== 0);
  const { LL } = useI18nContext();

-  const table_theme = useMemo(
-    () =>
-      useTheme({
-        Table: `
+  const table_theme = useTheme({
+    Table: `
      --data-table-library_grid-template-columns: repeat(1, minmax(0, 1fr)) minmax(120px, max-content) 120px;
    `,
-        BaseRow: `
+    BaseRow: `
      font-size: 14px;
    `,
-        HeaderRow: `
+    HeaderRow: `
      text-transform: uppercase;
      background-color: black;
      color: #90CAF9;
@@ -74,7 +72,7 @@ const ManageUsers = () => {
        border-bottom: 1px solid #565656;
      }
    `,
-        Row: `
+    Row: `
      .td {
        padding: 8px;
        border-top: 1px solid #565656;
@@ -87,7 +85,7 @@ const ManageUsers = () => {
        background-color: #1e1e1e;
      }
    `,
-        BaseCell: `
+    BaseCell: `
      &:nth-of-type(2) {
        text-align: center;
      }
@@ -95,44 +93,36 @@ const ManageUsers = () => {
        text-align: right;
      }
    `
-      }),
-    []
-  );
+  });

-  const noAdminConfigured = useCallback(
-    () => !data?.users.find((u) => u.admin),
-    [data]
-  );
+  const noAdminConfigured = () => !data?.users.find((u) => u.admin);

-  const removeUser = useCallback(
-    (toRemove: UserType) => {
-      if (!data) return;
-      const users = data.users.filter((u) => u.username !== toRemove.username);
-      updateDataValue({ ...data, users });
-      setChanged(changed + 1);
-    },
-    [data, updateDataValue, changed]
-  );
+  const removeUser = (toRemove: UserType) => {
+    if (!data) return;
+    const users = data.users.filter((u) => u.username !== toRemove.username);
+    updateDataValue({ ...data, users });
+    setChanged(changed + 1);
+  };

-  const createUser = useCallback(() => {
+  const createUser = () => {
    setCreating(true);
    setUser({
      username: '',
      password: '',
      admin: true
    });
-  }, []);
+  };

-  const editUser = useCallback((toEdit: UserType) => {
+  const editUser = (toEdit: UserType) => {
    setCreating(false);
    setUser({ ...toEdit });
-  }, []);
+  };

-  const cancelEditingUser = useCallback(() => {
+  const cancelEditingUser = () => {
    setUser(undefined);
-  }, []);
+  };

-  const doneEditingUser = useCallback(() => {
+  const doneEditingUser = () => {
    if (user && data) {
      const users = [
        ...data.users.filter(
@@ -144,26 +134,26 @@ const ManageUsers = () => {
      setUser(undefined);
      setChanged(changed + 1);
    }
-  }, [user, data, updateDataValue, changed]);
+  };

  const closeGenerateToken = useCallback(() => {
    setGeneratingToken(undefined);
  }, []);

-  const generateTokenForUser = useCallback((username: string) => {
+  const generateTokenForUser = (username: string) => {
    setGeneratingToken(username);
-  }, []);
+  };

-  const onSubmit = useCallback(async () => {
+  const onSubmit = async () => {
    await saveData();
    await authenticatedContext.refresh();
    setChanged(0);
-  }, [saveData, authenticatedContext]);
+  };

-  const onCancelSubmit = useCallback(async () => {
+  const onCancelSubmit = async () => {
    await loadData();
    setChanged(0);
-  }, [loadData]);
+  };

  const content = () => {
    if (!data) {
@@ -177,15 +167,10 @@ const ManageUsers = () => {
      admin: boolean;
    }

-    // add id to the type, needed for the table
-    const user_table = useMemo(
-      () =>
-        data.users.map((u) => ({
-          ...u,
-          id: u.username
-        })) as UserType2[],
-      [data.users]
-    );
+    const user_table = data.users.map((u) => ({
+      ...u,
+      id: u.username
+    })) as UserType2[];

    return (
      <>
@@ -1,35 +1,16 @@
-import { memo, useMemo } from 'react';
-import { Navigate, Route, Routes, matchRoutes, useLocation } from 'react-router';
+import { memo } from 'react';
+import { Outlet, useMatch } from 'react-router';

 import { Tab } from '@mui/material';

 import { RouterTabs, useLayoutTitle } from 'components';
 import { useI18nContext } from 'i18n/i18n-react';

-import ManageUsers from './ManageUsers';
-import SecuritySettings from './SecuritySettings';
-
 const Security = () => {
  const { LL } = useI18nContext();
  useLayoutTitle(LL.SECURITY(0));

-  const location = useLocation();
-
-  const matchedRoutes = useMemo(
-    () =>
-      matchRoutes(
-        [
-          {
-            path: '/settings/security/settings',
-            element: <ManageUsers />
-          },
-          { path: '/settings/security/users', element: <SecuritySettings /> }
-        ],
-        location
-      ),
-    [location]
-  );
-  const routerTab = matchedRoutes?.[0]?.route.path || false;
+  const routerTab = useMatch('/settings/security/:tab')?.pathname || false;

  return (
    <>
@@ -40,14 +21,7 @@ const Security = () => {
        />
        <Tab value="/settings/security/users" label={LL.MANAGE_USERS()} />
      </RouterTabs>
-      <Routes>
-        <Route path="users" element={<ManageUsers />} />
-        <Route path="settings" element={<SecuritySettings />} />
-        <Route
-          path="*"
-          element={<Navigate replace to="/settings/security/settings" />}
-        />
-      </Routes>
+      <Outlet />
    </>
  );
 };
@@ -6,7 +6,6 @@ import { Button } from '@mui/material';

 import * as SecurityApi from 'api/security';

-import type { ValidateFieldsError } from 'async-validator';
 import {
  BlockNavigation,
  ButtonRow,
@@ -20,6 +19,7 @@ import { useI18nContext } from 'i18n/i18n-react';
 import type { SecuritySettingsType } from 'types';
 import { updateValueDirty, useRest } from 'utils';
 import { SECURITY_SETTINGS_VALIDATOR, ValidationError, validate } from 'validators';
+import type { ValidateFieldsError } from 'validators/schema';

 const SecuritySettings = () => {
  const { LL } = useI18nContext();
@@ -79,7 +79,7 @@ const SecuritySettings = () => {
          onChange={updateFormValue}
          margin="normal"
        />
-        <MessageBox level="info" message={LL.SU_TEXT()} mt={1} />
+        <MessageBox level="info" message={LL.SU_TEXT()} sx={{ mt: 1 }} />
        {dirtyFlags && dirtyFlags.length !== 0 && (
          <ButtonRow>
            <Button
@@ -1,4 +1,4 @@
-import { memo, useCallback, useEffect, useState } from 'react';
+import { memo, useEffect, useState } from 'react';
 import type { FC } from 'react';

 import CancelIcon from '@mui/icons-material/Cancel';
@@ -14,8 +14,6 @@ import {
 } from '@mui/material';

 import { dialogStyle } from 'CustomTheme';
-import type Schema from 'async-validator';
-import type { ValidateFieldsError } from 'async-validator';
 import {
  BlockFormControlLabel,
  ValidatedPasswordField,
@@ -25,6 +23,8 @@ import { useI18nContext } from 'i18n/i18n-react';
 import type { UserType } from 'types';
 import { updateValue } from 'utils';
 import { ValidationError, validate } from 'validators';
+import type Schema from 'validators/schema';
+import type { ValidateFieldsError } from 'validators/schema';

 interface UserFormProps {
  creating: boolean;
@@ -62,7 +62,7 @@ const User: FC<UserFormProps> = ({
    }
  }, [open]);

-  const validateAndDone = useCallback(async () => {
+  const validateAndDone = async () => {
    if (user) {
      try {
        setFieldErrors(undefined);
@@ -72,7 +72,7 @@ const User: FC<UserFormProps> = ({
        setFieldErrors((error as ValidationError).fieldErrors);
      }
    }
-  }, [user, validator, onDoneEditing]);
+  };

  return (
    <Dialog
@@ -90,7 +90,10 @@ const APStatus = () => {
          <ListItemAvatar>
            <Avatar sx={{ bgcolor: 'primary.main' }}>IP</Avatar>
          </ListItemAvatar>
-          <ListItemText primary={LL.ADDRESS_OF('IP')} secondary={data.ip_address} />
+          <ListItemText
+            primary={LL.ADDRESS_OF('IP')}
+            secondary={data.ip_address || 'none'}
+          />
        </ListItem>

        <Divider variant="inset" component="li" />
@@ -103,7 +106,7 @@ const APStatus = () => {
          </ListItemAvatar>
          <ListItemText
            primary={LL.ADDRESS_OF('MAC')}
-            secondary={data.mac_address}
+            secondary={data.mac_address || 'none'}
          />
        </ListItem>

@@ -1,5 +1,3 @@
-import { useCallback, useMemo } from 'react';
-
 import {
  Body,
  Cell,
@@ -36,16 +34,14 @@ const SystemActivity = () => {

  useLayoutTitle(LL.DATA_TRAFFIC());

-  const stats_theme = tableTheme(
-    useMemo(
-      () => ({
-        Table: `
+  const stats_theme = tableTheme({
+    Table: `
      --data-table-library_grid-template-columns: repeat(1, minmax(0, 1fr)) 90px 90px 80px;
    `,
-        BaseRow: `
+    BaseRow: `
      font-size: 14px;
    `,
-        HeaderRow: `
+    HeaderRow: `
      text-transform: uppercase;
      background-color: black;
      color: #90CAF9;
@@ -55,7 +51,7 @@ const SystemActivity = () => {
        border-bottom: 1px solid #565656;
      }
    `,
-        Row: `
+    Row: `
      .td {
        padding: 8px;
        border-top: 1px solid #565656;
@@ -69,26 +65,20 @@ const SystemActivity = () => {
        background-color: #1e1e1e;
      }
    `,
-        BaseCell: `
+    BaseCell: `
      &:not(:first-of-type) {
        text-align: center;
      }
    `
-      }),
-      []
-    )
-  );
+  });

-  const showName = useCallback(
-    (id: number) => {
-      const name: keyof Translation['STATUS_NAMES'] =
-        id.toString() as keyof Translation['STATUS_NAMES'];
-      return LL.STATUS_NAMES[name]();
-    },
-    [LL]
-  );
+  const showName = (id: number) => {
+    const name: keyof Translation['STATUS_NAMES'] =
+      id.toString() as keyof Translation['STATUS_NAMES'];
+    return LL.STATUS_NAMES[name]();
+  };

-  const showQuality = useCallback((stat: Stat) => {
+  const showQuality = (stat: Stat) => {
    if (stat.q === 0 || stat.s + stat.f === 0) {
      return;
    }
@@ -100,14 +90,18 @@ const SystemActivity = () => {
    } else {
      return <div style={{ color: QUALITY_COLORS.POOR }}>{stat.q}%</div>;
    }
-  }, []);
-
-  const content = useMemo(() => {
-    if (!data) {
-      return <FormLoader onRetry={loadData} errorMessage={error?.message || ''} />;
-    }
+  };

+  if (!data) {
    return (
+      <SectionContent>
+        <FormLoader onRetry={loadData} errorMessage={error?.message || ''} />
+      </SectionContent>
+    );
+  }
+
+  return (
+    <SectionContent>
      <Table
        data={{ nodes: data.stats }}
        theme={stats_theme}
@@ -136,10 +130,8 @@ const SystemActivity = () => {
          </>
        )}
      </Table>
-    );
-  }, [data, loadData, error?.message, stats_theme, LL, showName, showQuality]);
-
-  return <SectionContent>{content}</SectionContent>;
+    </SectionContent>
+  );
 };

 export default SystemActivity;
@@ -1,4 +1,4 @@
-import { type FC, memo, useMemo } from 'react';
+import { type FC, memo } from 'react';

 import AutoAwesomeMotionIcon from '@mui/icons-material/AutoAwesomeMotion';
 import DeviceHubIcon from '@mui/icons-material/DeviceHub';
@@ -127,16 +127,15 @@ const MqttStatus = () => {
    void loadData();
  });

-  // Memoize error message separately to avoid re-renders on error object changes
  const errorMessage = error?.message || '';

-  const mqttStatusText = useMemo(() => {
-    if (!data) return '';
-    if (!data.enabled) return LL.NOT_ENABLED();
-    return data.connected
-      ? `${LL.CONNECTED(0)} (${data.connect_count})`
-      : `${LL.DISCONNECTED()} (${data.connect_count})`;
-  }, [data, LL]);
+  const mqttStatusText = !data
+    ? ''
+    : !data.enabled
+      ? LL.NOT_ENABLED()
+      : data.connected
+        ? `${LL.CONNECTED(0)} (${data.connect_count})`
+        : `${LL.DISCONNECTED()} (${data.connect_count})`;

  if (!data) {
    return (
@@ -1,5 +1,3 @@
-import { useMemo } from 'react';
-
 import AccessTimeIcon from '@mui/icons-material/AccessTime';
 import DnsIcon from '@mui/icons-material/Dns';
 import SwapVerticalCircleIcon from '@mui/icons-material/SwapVerticalCircle';
@@ -67,12 +65,16 @@ const NTPStatus = () => {
    }
  };

-  const content = useMemo(() => {
-    if (!data) {
-      return <FormLoader onRetry={loadData} errorMessage={error?.message || ''} />;
-    }
-
+  if (!data) {
    return (
+      <SectionContent>
+        <FormLoader onRetry={loadData} errorMessage={error?.message || ''} />
+      </SectionContent>
+    );
+  }
+
+  return (
+    <SectionContent>
      <List>
        <ListItem>
          <ListItemAvatar>
@@ -121,10 +123,8 @@ const NTPStatus = () => {
        </ListItem>
        <Divider variant="inset" component="li" />
      </List>
-    );
-  }, [data, error, loadData, LL, theme]);
-
-  return <SectionContent>{content}</SectionContent>;
+    </SectionContent>
+  );
 };

 export default NTPStatus;
@@ -1,5 +1,3 @@
-import { useMemo } from 'react';
-
 import DeviceHubIcon from '@mui/icons-material/DeviceHub';
 import DnsIcon from '@mui/icons-material/Dns';
 import GiteIcon from '@mui/icons-material/Gite';
@@ -9,11 +7,13 @@ import SettingsInputComponentIcon from '@mui/icons-material/SettingsInputCompone
 import WifiIcon from '@mui/icons-material/Wifi';
 import {
  Avatar,
+  Box,
  Divider,
  List,
  ListItem,
  ListItemAvatar,
  ListItemText,
+  Typography,
  useTheme
 } from '@mui/material';
 import type { Theme } from '@mui/material';
@@ -64,26 +64,45 @@ const networkQualityHighlight = ({ rssi }: NetworkStatusType, theme: Theme) => {
  return theme.palette.success.main;
 };

-const dnsServers = ({ dns_ip_1, dns_ip_2 }: NetworkStatusType) => {
-  if (!dns_ip_1) {
+// one address per line, with an optional dimmed note such as the IPv6 scope
+const AddressList = ({
+  addresses
+}: {
+  addresses: { value: string; note?: string }[];
+}) => {
+  if (addresses.length === 0) {
    return 'none';
  }
-  return dns_ip_1 + (!dns_ip_2 || dns_ip_2 === '0.0.0.0' ? '' : ', ' + dns_ip_2);
+  return addresses.map(({ value, note }) => (
+    <Box component="span" sx={{ display: 'block' }} key={value}>
+      {value}
+      {note && (
+        <Typography
+          component="span"
+          variant="body2"
+          sx={{ color: 'grey.600', ml: 1 }} // dimmer than the grey[500] secondary text
+        >
+          ({note})
+        </Typography>
+      )}
+    </Box>
+  ));
 };

-const IPs = (status: NetworkStatusType) => {
-  if (
-    !status.local_ipv6 ||
-    status.local_ipv6 === '0000:0000:0000:0000:0000:0000:0000:0000' ||
-    status.local_ipv6 === '::'
-  ) {
-    return status.local_ip;
-  }
-  if (!status.local_ip || status.local_ip === '0.0.0.0') {
-    return status.local_ipv6;
-  }
-  return status.local_ip + ', ' + status.local_ipv6;
-};
+const isSet = (ip?: string): ip is string => !!ip && ip !== '0.0.0.0' && ip !== '::';
+
+const ipAddresses = ({ local_ip, ipv6 }: NetworkStatusType) => [
+  ...(isSet(local_ip) ? [{ value: local_ip }] : []),
+  ...(ipv6 ?? []).map(({ address, scope }) => ({ value: address, note: scope }))
+];
+
+const gateways = ({ gateway_ip, gateway_ipv6 }: NetworkStatusType) => [
+  ...(isSet(gateway_ip) ? [{ value: gateway_ip }] : []),
+  ...(gateway_ipv6 ?? []).filter(isSet).map((value) => ({ value }))
+];
+
+const dnsServers = ({ dns }: NetworkStatusType) =>
+  (dns ?? []).filter(isSet).map((value) => ({ value }));

 const getNetworkStatusText = (
  status: NetworkConnectionStatus,
@@ -124,16 +143,20 @@ const NetworkStatus = () => {

  const theme = useTheme();

-  const content = useMemo(() => {
-    if (!data) {
-      return <FormLoader onRetry={loadData} errorMessage={error?.message || ''} />;
-    }
-
-    const statusText = getNetworkStatusText(data.status, data.reconnect_count, LL);
-    const statusColor = networkStatusHighlight(data, theme);
-    const qualityColor = networkQualityHighlight(data, theme);
-
+  if (!data) {
    return (
+      <SectionContent>
+        <FormLoader onRetry={loadData} errorMessage={error?.message || ''} />
+      </SectionContent>
+    );
+  }
+
+  const statusText = getNetworkStatusText(data.status, data.reconnect_count, LL);
+  const statusColor = networkStatusHighlight(data, theme);
+  const qualityColor = networkQualityHighlight(data, theme);
+
+  return (
+    <SectionContent>
      <List>
        <ListItem>
          <ListItemAvatar>
@@ -176,7 +199,10 @@ const NetworkStatus = () => {
              <ListItemAvatar>
                <Avatar>IP</Avatar>
              </ListItemAvatar>
-              <ListItemText primary={LL.ADDRESS_OF('IP')} secondary={IPs(data)} />
+              <ListItemText
+                primary={LL.ADDRESS_OF('IP')}
+                secondary={<AddressList addresses={ipAddresses(data)} />}
+              />
            </ListItem>
            <Divider variant="inset" component="li" />
            <ListItem>
@@ -209,7 +235,7 @@ const NetworkStatus = () => {
              </ListItemAvatar>
              <ListItemText
                primary={LL.NETWORK_GATEWAY()}
-                secondary={data.gateway_ip || 'none'}
+                secondary={<AddressList addresses={gateways(data)} />}
              />
            </ListItem>
            <Divider variant="inset" component="li" />
@@ -221,16 +247,14 @@ const NetworkStatus = () => {
              </ListItemAvatar>
              <ListItemText
                primary={LL.NETWORK_DNS()}
-                secondary={dnsServers(data)}
+                secondary={<AddressList addresses={dnsServers(data)} />}
              />
            </ListItem>
          </>
        )}
      </List>
-    );
-  }, [data, error, loadData, LL, theme]);
-
-  return <SectionContent>{content}</SectionContent>;
+    </SectionContent>
+  );
 };

 export default NetworkStatus;
@@ -1,25 +1,14 @@
-import { useCallback, useContext, useMemo, useState } from 'react';
-import { toast } from 'react-toastify';
-
 import AccessTimeIcon from '@mui/icons-material/AccessTime';
-import BuildIcon from '@mui/icons-material/Build';
-import CancelIcon from '@mui/icons-material/Cancel';
 import DeviceHubIcon from '@mui/icons-material/DeviceHub';
 import DirectionsBusIcon from '@mui/icons-material/DirectionsBus';
 import LogoDevIcon from '@mui/icons-material/LogoDev';
 import MemoryIcon from '@mui/icons-material/Memory';
 import MonitorHeartIcon from '@mui/icons-material/MonitorHeart';
-import PowerSettingsNewIcon from '@mui/icons-material/PowerSettingsNew';
 import RouterIcon from '@mui/icons-material/Router';
 import SettingsInputAntennaIcon from '@mui/icons-material/SettingsInputAntenna';
 import WifiIcon from '@mui/icons-material/Wifi';
 import {
  Avatar,
-  Button,
-  Dialog,
-  DialogActions,
-  DialogContent,
-  DialogTitle,
  List,
  ListItem,
  ListItemAvatar,
@@ -27,23 +16,17 @@ import {
  useTheme
 } from '@mui/material';

-import { API } from 'api/app';
 import { readSystemStatus } from 'api/system';

-import { dialogStyle } from 'CustomTheme';
 import { useRequest } from 'alova/client';
-import { type APIcall, busConnectionStatus } from 'app/main/types';
+import { busConnectionStatus } from 'app/main/types';
 import { FormLoader, SectionContent, useLayoutTitle } from 'components';
 import ListMenuItem from 'components/layout/ListMenuItem';
-import { AuthenticatedContext } from 'contexts/authentication';
 import { useI18nContext } from 'i18n/i18n-react';
 import { NTPSyncStatus, NetworkConnectionStatus, SystemStatusCodes } from 'types';
 import { useInterval } from 'utils';
 import { formatDateTime } from 'utils/time';

-import SystemMonitor from './SystemMonitor';
-
-// Pure functions moved outside component to avoid recreation on each render
 const formatNumber = (num: number) => new Intl.NumberFormat().format(num);

 const formatDurationSec = (
@@ -70,26 +53,7 @@ const SystemStatus = () => {

  useLayoutTitle(LL.STATUS_OF(''));

-  const { me } = useContext(AuthenticatedContext);
-
-  const [confirmRestart, setConfirmRestart] = useState<boolean>(false);
-  const [restarting, setRestarting] = useState<boolean>();
-
-  const { send: sendAPI } = useRequest((data: APIcall) => API(data), {
-    immediate: false
-  });
-
-  const {
-    data,
-    send: loadData,
-    error
-  } = useRequest(readSystemStatus, {
-    async middleware(_, next) {
-      if (!restarting) {
-        await next();
-      }
-    }
-  });
+  const { data, send: loadData, error } = useRequest(readSystemStatus);

  useInterval(() => {
    void loadData();
@@ -97,10 +61,8 @@ const SystemStatus = () => {

  const theme = useTheme();

-  // Memoize derived status values to avoid recalculation on every render
-  const busStatus = useMemo(() => {
+  const busStatus = (() => {
    if (!data) return 'EMS state unknown';
-
    switch (data.bus_status) {
      case busConnectionStatus.BUS_STATUS_CONNECTED:
        return `EMS ${LL.CONNECTED(0)} (${formatDurationSec(data.bus_uptime, LL)})`;
@@ -111,12 +73,10 @@ const SystemStatus = () => {
      default:
        return 'EMS state unknown';
    }
-  }, [data?.bus_status, data?.bus_uptime, LL]);
+  })();

-  // Memoize derived status values to avoid recalculation on every render
-  const systemStatus = useMemo(() => {
+  const systemStatus = (() => {
    if (!data) return '??';
-
    switch (data.status) {
      case SystemStatusCodes.SYSTEM_STATUS_PENDING_UPLOAD:
      case SystemStatusCodes.SYSTEM_STATUS_UPLOADING:
@@ -129,14 +89,12 @@ const SystemStatus = () => {
      case SystemStatusCodes.SYSTEM_STATUS_INVALID_GPIO:
        return LL.GPIO_OF(LL.FAILED(0));
      default:
-        // SystemStatusCodes.SYSTEM_STATUS_NORMAL
        return 'OK';
    }
-  }, [data?.status, LL]);
+  })();

-  const busStatusHighlight = useMemo(() => {
+  const busStatusHighlight = (() => {
    if (!data) return theme.palette.warning.main;
-
    switch (data.bus_status) {
      case busConnectionStatus.BUS_STATUS_TX_ERRORS:
        return theme.palette.warning.main;
@@ -147,11 +105,10 @@ const SystemStatus = () => {
      default:
        return theme.palette.warning.main;
    }
-  }, [data?.bus_status, theme.palette]);
+  })();

-  const ntpStatus = useMemo(() => {
+  const ntpStatus = (() => {
    if (!data) return LL.UNKNOWN();
-
    switch (data.ntp_status) {
      case NTPSyncStatus.NTP_DISABLED:
        return LL.NOT_ENABLED();
@@ -164,11 +121,10 @@ const SystemStatus = () => {
      default:
        return LL.UNKNOWN();
    }
-  }, [data?.ntp_status, data?.ntp_time, LL]);
+  })();

-  const ntpStatusHighlight = useMemo(() => {
+  const ntpStatusHighlight = (() => {
    if (!data) return theme.palette.error.main;
-
    switch (data.ntp_status) {
      case NTPSyncStatus.NTP_DISABLED:
        return theme.palette.info.main;
@@ -179,11 +135,10 @@ const SystemStatus = () => {
      default:
        return theme.palette.error.main;
    }
-  }, [data?.ntp_status, theme.palette]);
+  })();

-  const networkStatusHighlight = useMemo(() => {
+  const networkStatusHighlight = (() => {
    if (!data) return theme.palette.warning.main;
-
    switch (data.network_status) {
      case NetworkConnectionStatus.WIFI_STATUS_IDLE:
      case NetworkConnectionStatus.WIFI_STATUS_DISCONNECTED:
@@ -198,11 +153,10 @@ const SystemStatus = () => {
      default:
        return theme.palette.warning.main;
    }
-  }, [data?.network_status, theme.palette]);
+  })();

-  const networkStatus = useMemo(() => {
+  const networkStatus = (() => {
    if (!data) return LL.UNKNOWN();
-
    switch (data.network_status) {
      case NetworkConnectionStatus.WIFI_STATUS_NO_SHIELD:
        return LL.INACTIVE(1);
@@ -223,227 +177,96 @@ const SystemStatus = () => {
      default:
        return LL.UNKNOWN();
    }
-  }, [data?.network_status, data?.wifi_rssi, LL]);
+  })();

-  const activeHighlight = useCallback(
-    (value: boolean) =>
-      value ? theme.palette.success.main : theme.palette.info.main,
-    [theme.palette]
-  );
-
-  const doRestart = useCallback(async () => {
-    setConfirmRestart(false);
-    setRestarting(true);
-    await sendAPI({ device: 'system', cmd: 'restart', id: 0 }).catch(
-      (error: Error) => {
-        toast.error(error.message);
-      }
-    );
-  }, [sendAPI]);
-
-  const handleCloseRestartDialog = useCallback(() => {
-    setConfirmRestart(false);
-  }, []);
-
-  const renderRestartDialog = useMemo(
-    () => (
-      <Dialog
-        sx={dialogStyle}
-        open={confirmRestart}
-        onClose={handleCloseRestartDialog}
-      >
-        <DialogTitle>{LL.RESTART()}</DialogTitle>
-        <DialogContent dividers>{LL.RESTART_CONFIRM()}</DialogContent>
-        <DialogActions>
-          <Button
-            startIcon={<CancelIcon />}
-            variant="outlined"
-            onClick={handleCloseRestartDialog}
-            color="secondary"
-          >
-            {LL.CANCEL()}
-          </Button>
-          <Button
-            startIcon={<PowerSettingsNewIcon />}
-            variant="outlined"
-            onClick={doRestart}
-            color="error"
-          >
-            {LL.RESTART()}
-          </Button>
-        </DialogActions>
-      </Dialog>
-    ),
-    [confirmRestart, handleCloseRestartDialog, doRestart, LL]
-  );
-
-  // Memoize formatted values
-  const firmwareVersion = useMemo(
-    () => `v${data?.emsesp_version || ''}`,
-    [data?.emsesp_version]
-  );
-
-  const uptimeText = useMemo(
-    () => (data ? formatDurationSec(data.uptime, LL) : ''),
-    [data?.uptime, LL]
-  );
-
-  const freeMemoryText = useMemo(
-    () => (data ? `${formatNumber(data.free_heap)} KB ${LL.FREE_MEMORY()}` : ''),
-    [data?.free_heap, LL]
-  );
-
-  const networkIcon = useMemo(
-    () =>
-      data?.network_status === NetworkConnectionStatus.WIFI_STATUS_CONNECTED
-        ? WifiIcon
-        : RouterIcon,
-    [data?.network_status]
-  );
-
-  const mqttStatusText = useMemo(
-    () => (data?.mqtt_status ? LL.CONNECTED(0) : LL.INACTIVE(0)),
-    [data?.mqtt_status, LL]
-  );
-
-  const apStatusText = useMemo(
-    () => (data?.ap_status ? LL.ACTIVE() : LL.INACTIVE(0)),
-    [data?.ap_status, LL]
-  );
-
-  const handleRestartClick = useCallback(() => {
-    setConfirmRestart(true);
-  }, []);
-
-  const content = useMemo(() => {
-    if (!data || !LL) {
-      return <FormLoader onRetry={loadData} errorMessage={error?.message || ''} />;
-    }
+  const activeHighlight = (value: boolean) =>
+    value ? theme.palette.success.main : theme.palette.info.main;

+  if (!data || !LL) {
    return (
-      <>
-        <List>
-          <ListMenuItem
-            icon={BuildIcon}
-            bgcolor="#72caf9"
-            label="EMS-ESP Firmware"
-            text={firmwareVersion}
-            to="version"
-          />
-
-          <ListItem>
-            <ListItemAvatar>
-              <Avatar sx={{ bgcolor: '#c5572c', color: 'white' }}>
-                <MonitorHeartIcon />
-              </Avatar>
-            </ListItemAvatar>
-            <ListItemText
-              primary={LL.STATUS_OF(LL.SYSTEM(0))}
-              secondary={`${systemStatus} (${LL.UPTIME()}: ${uptimeText})`}
-            />
-            {me.admin && (
-              <Button
-                startIcon={<PowerSettingsNewIcon />}
-                variant="outlined"
-                color="error"
-                onClick={handleRestartClick}
-              >
-                {LL.RESTART()}
-              </Button>
-            )}
-          </ListItem>
-
-          <ListMenuItem
-            disabled={!me.admin}
-            icon={MemoryIcon}
-            bgcolor="#68374d"
-            label={LL.HARDWARE()}
-            text={freeMemoryText}
-            to="/status/hardwarestatus"
-          />
-
-          <ListMenuItem
-            disabled={!me.admin}
-            icon={DirectionsBusIcon}
-            bgcolor={busStatusHighlight}
-            label={LL.DATA_TRAFFIC()}
-            text={busStatus}
-            to="/status/activity"
-          />
-
-          <ListMenuItem
-            disabled={!me.admin}
-            icon={networkIcon}
-            bgcolor={networkStatusHighlight}
-            label={LL.NETWORK(1)}
-            text={networkStatus}
-            to="/status/network"
-          />
-
-          <ListMenuItem
-            disabled={!me.admin}
-            icon={DeviceHubIcon}
-            bgcolor={activeHighlight(data.mqtt_status)}
-            label="MQTT"
-            text={mqttStatusText}
-            to="/status/mqtt"
-          />
-
-          <ListMenuItem
-            disabled={!me.admin}
-            icon={AccessTimeIcon}
-            bgcolor={ntpStatusHighlight}
-            label="NTP"
-            text={ntpStatus}
-            to="/status/ntp"
-          />
-
-          <ListMenuItem
-            disabled={!me.admin}
-            icon={SettingsInputAntennaIcon}
-            bgcolor={activeHighlight(data.ap_status)}
-            label={LL.ACCESS_POINT(0)}
-            text={apStatusText}
-            to="/status/ap"
-          />
-
-          <ListMenuItem
-            disabled={!me.admin}
-            icon={LogoDevIcon}
-            bgcolor="#40828f"
-            label={LL.LOG_OF(LL.SYSTEM(0))}
-            text={LL.VIEW_LOG()}
-            to="/status/log"
-          />
-        </List>
-
-        {renderRestartDialog}
-      </>
+      <SectionContent>
+        <FormLoader onRetry={loadData} errorMessage={error?.message || ''} />
+      </SectionContent>
    );
-  }, [
-    data,
-    LL,
-    firmwareVersion,
-    uptimeText,
-    freeMemoryText,
-    networkIcon,
-    mqttStatusText,
-    apStatusText,
-    busStatus,
-    busStatusHighlight,
-    networkStatusHighlight,
-    networkStatus,
-    ntpStatusHighlight,
-    ntpStatus,
-    activeHighlight,
-    me.admin,
-    handleRestartClick,
-    error,
-    loadData,
-    renderRestartDialog
-  ]);
+  }

-  return restarting ? <SystemMonitor /> : <SectionContent>{content}</SectionContent>;
+  return (
+    <SectionContent>
+      <List>
+        <ListItem>
+          <ListItemAvatar>
+            <Avatar sx={{ bgcolor: '#c5572c', color: 'white' }}>
+              <MonitorHeartIcon />
+            </Avatar>
+          </ListItemAvatar>
+          <ListItemText
+            primary={LL.STATUS_OF(LL.SYSTEM(0))}
+            secondary={`${systemStatus} (${LL.UPTIME()}: ${formatDurationSec(data.uptime, LL)})`}
+          />
+        </ListItem>
+
+        <ListMenuItem
+          icon={MemoryIcon}
+          bgcolor="#68374d"
+          label={LL.HARDWARE()}
+          text={`${formatNumber(data.free_heap)} KB ${LL.FREE_MEMORY()}`}
+          to="/status/hardwarestatus"
+        />
+
+        <ListMenuItem
+          icon={DirectionsBusIcon}
+          bgcolor={busStatusHighlight}
+          label={LL.DATA_TRAFFIC()}
+          text={busStatus}
+          to="/status/activity"
+        />
+
+        <ListMenuItem
+          icon={
+            data.network_status === NetworkConnectionStatus.WIFI_STATUS_CONNECTED
+              ? WifiIcon
+              : RouterIcon
+          }
+          bgcolor={networkStatusHighlight}
+          label={LL.NETWORK(1)}
+          text={networkStatus}
+          to="/status/network"
+        />
+
+        <ListMenuItem
+          icon={DeviceHubIcon}
+          bgcolor={activeHighlight(data.mqtt_status)}
+          label="MQTT"
+          text={data.mqtt_status ? LL.CONNECTED(0) : LL.INACTIVE(0)}
+          to="/status/mqtt"
+        />
+
+        <ListMenuItem
+          icon={AccessTimeIcon}
+          bgcolor={ntpStatusHighlight}
+          label="NTP"
+          text={ntpStatus}
+          to="/status/ntp"
+        />
+
+        <ListMenuItem
+          icon={SettingsInputAntennaIcon}
+          bgcolor={activeHighlight(data.ap_status)}
+          label={LL.ACCESS_POINT(0)}
+          text={data.ap_status ? LL.ACTIVE() : LL.INACTIVE(0)}
+          to="/status/ap"
+        />
+
+        <ListMenuItem
+          icon={LogoDevIcon}
+          bgcolor="#40828f"
+          label={LL.LOG_OF(LL.SYSTEM(0))}
+          text={LL.VIEW_LOG()}
+          to="/status/log"
+        />
+      </List>
+    </SectionContent>
+  );
 };

 export default SystemStatus;
@@ -1,12 +1,4 @@
-import {
-  memo,
-  useCallback,
-  useEffect,
-  useLayoutEffect,
-  useRef,
-  useState
-} from 'react';
-import { toast } from 'react-toastify';
+import { memo, useEffect, useLayoutEffect, useRef, useState } from 'react';

 import DownloadIcon from '@mui/icons-material/GetApp';
 import PlayArrowIcon from '@mui/icons-material/PlayArrow';
@@ -33,6 +25,7 @@ import {
  SectionContent,
  useLayoutTitle
 } from 'components';
+import { toast } from 'components/toast';
 import { useI18nContext } from 'i18n/i18n-react';
 import type { LogEntry, LogSettings } from 'types';
 import { LogLevel } from 'types';
@@ -185,8 +178,7 @@ const SystemLog = () => {
    };
  }, [data]); // Recalculate when data changes (in case layout shifts)

-  // Memoize message handler to avoid recreating on every render
-  const handleLogMessage = useCallback((message: { data: string }) => {
+  const handleLogMessage = (message: { data: string }) => {
    const rawData = message.data;
    const logentry = JSON.parse(rawData) as LogEntry;
    setLogEntries((log) => {
@@ -200,7 +192,7 @@ const SystemLog = () => {
      const newLog = [...log, logentry];
      return newLog;
    });
-  }, []);
+  };

  useSSE(fetchLogES, {
    immediate: true,
@@ -211,7 +203,7 @@ const SystemLog = () => {
      toast.error('No connection to Log service');
    });

-  const onDownload = useCallback(() => {
+  const onDownload = () => {
    const result = logEntries
      .map((i) => `${i.t} ${levelLabel(i.l)} ${i.i}: [${i.n}] ${i.m}`)
      .join('\n');
@@ -225,11 +217,11 @@ const SystemLog = () => {
    document.body.appendChild(a);
    a.click();
    document.body.removeChild(a);
-  }, [logEntries]);
+  };

-  const saveSettings = useCallback(async () => {
+  const saveSettings = async () => {
    await saveData();
-  }, [saveData]);
+  };

  // handle scrolling - optimized to only scroll when needed
  const ref = useRef<HTMLDivElement>(null);
@@ -246,7 +238,7 @@ const SystemLog = () => {
    }
  }, [logEntries.length, autoscroll]);

-  const sendReadCommand = useCallback(() => {
+  const sendReadCommand = () => {
    if (readValue === '') {
      setReadOpen(!readOpen);
      return;
@@ -257,7 +249,7 @@ const SystemLog = () => {
      setReadOpen(false);
      setReadValue('');
    }
-  }, [readValue, readOpen, send]);
+  };

  const content = () => {
    if (!data) {
@@ -377,7 +369,7 @@ const SystemLog = () => {
          ) : (
            <>
              {data.developer_mode && (
-                <IconButton onClick={sendReadCommand} aria-label={LL.EXECUTE()}>
+                <IconButton onClick={sendReadCommand} aria-label={LL.RUN()}>
                  <PlayArrowIcon color="primary" />
                </IconButton>
              )}
@@ -1,4 +1,4 @@
-import { useCallback, useMemo, useRef, useState } from 'react';
+import { useRef, useState } from 'react';

 import CancelIcon from '@mui/icons-material/Cancel';
 import { Box, Button, Typography } from '@mui/material';
@@ -57,39 +57,31 @@ const SystemMonitor = () => {
    void send();
  }, 1000); // check every 1 second

-  const { statusMessage, isUploading, progressValue } = useMemo(() => {
-    const status = data?.status;
+  const status = data?.status;

-    const message =
-      status && status >= SystemStatusCodes.SYSTEM_STATUS_UPLOADING
-        ? LL.WAIT_FIRMWARE()
-        : status === SystemStatusCodes.SYSTEM_STATUS_PENDING_RESTART
-          ? LL.APPLICATION_RESTARTING()
-          : status === SystemStatusCodes.SYSTEM_STATUS_NORMAL
-            ? LL.RESTARTING_PRE()
-            : status === SystemStatusCodes.SYSTEM_STATUS_ERROR_UPLOAD
-              ? 'Upload Failed'
-              : LL.RESTARTING_POST();
+  const statusMessage =
+    status && status >= SystemStatusCodes.SYSTEM_STATUS_UPLOADING
+      ? LL.WAIT_FIRMWARE()
+      : status === SystemStatusCodes.SYSTEM_STATUS_PENDING_RESTART
+        ? LL.APPLICATION_RESTARTING()
+        : status === SystemStatusCodes.SYSTEM_STATUS_NORMAL
+          ? LL.RESTARTING_PRE()
+          : status === SystemStatusCodes.SYSTEM_STATUS_ERROR_UPLOAD
+            ? 'Upload Failed'
+            : LL.RESTARTING_POST();

-    const uploading =
-      status !== undefined && status >= SystemStatusCodes.SYSTEM_STATUS_UPLOADING;
-    const progress =
-      uploading && status
-        ? Math.round(status - SystemStatusCodes.SYSTEM_STATUS_UPLOADING)
-        : 0;
+  const isUploading =
+    status !== undefined && status >= SystemStatusCodes.SYSTEM_STATUS_UPLOADING;
+  const progressValue =
+    isUploading && status
+      ? Math.round(status - SystemStatusCodes.SYSTEM_STATUS_UPLOADING)
+      : 0;

-    return {
-      statusMessage: message,
-      isUploading: uploading,
-      progressValue: progress
-    };
-  }, [data?.status, LL]);
-
-  const onCancel = useCallback(async () => {
+  const onCancel = async () => {
    setErrorMessage(undefined);
    await setSystemStatus(String(SystemStatusCodes.SYSTEM_STATUS_NORMAL));
    document.location.href = '/';
-  }, [setSystemStatus]);
+  };

  return (
    <Box
@@ -153,9 +145,21 @@ const SystemMonitor = () => {
                {LL.PLEASE_WAIT()}&hellip;
              </Typography>
              {isUploading && (
-                <Box sx={{ width: '100%', pl: 2, pr: 2, py: 2 }}>
-                  <LinearProgressWithLabel value={progressValue} />
-                </Box>
+                <>
+                  <Box sx={{ width: '100%', pl: 2, pr: 2, py: 2 }}>
+                    <LinearProgressWithLabel value={progressValue} />
+                  </Box>
+
+                  <Button
+                    sx={{ ml: 2, mt: 2 }}
+                    startIcon={<CancelIcon />}
+                    variant="outlined"
+                    color="secondary"
+                    onClick={onCancel}
+                  >
+                    {LL.CANCEL()}
+                  </Button>
+                </>
              )}
            </>
          )}
@@ -1,931 +0,0 @@
-import {
-  memo,
-  useCallback,
-  useContext,
-  useEffect,
-  useMemo,
-  useRef,
-  useState
-} from 'react';
-import { Link } from 'react-router';
-import { toast } from 'react-toastify';
-
-import CancelIcon from '@mui/icons-material/Cancel';
-import CloseIcon from '@mui/icons-material/Close';
-import CheckIcon from '@mui/icons-material/Done';
-import DownloadIcon from '@mui/icons-material/GetApp';
-import InfoOutlinedIcon from '@mui/icons-material/InfoOutlined';
-import WarningIcon from '@mui/icons-material/Warning';
-import {
-  Box,
-  Button,
-  Dialog,
-  DialogActions,
-  DialogContent,
-  DialogTitle,
-  Grid,
-  IconButton,
-  Table,
-  TableBody,
-  TableCell,
-  TableRow,
-  Typography
-} from '@mui/material';
-
-import * as SystemApi from 'api/system';
-import { API, callAction } from 'api/app';
-import { getDevVersion, getStableVersion } from 'api/system';
-
-import { dialogStyle } from 'CustomTheme';
-import { useRequest } from 'alova/client';
-import type { APIcall } from 'app/main/types';
-import SystemMonitor from 'app/status/SystemMonitor';
-import {
-  FormLoader,
-  SectionContent,
-  SingleUpload,
-  useLayoutTitle
-} from 'components';
-import { AuthenticatedContext } from 'contexts/authentication';
-import { useI18nContext } from 'i18n/i18n-react';
-import type { TranslationFunctions } from 'i18n/i18n-types';
-import { prettyDateTime } from 'utils/time';
-
-// Constants moved outside component to avoid recreation
-const STABLE_URL = 'https://github.com/emsesp/EMS-ESP32/releases/download/';
-const STABLE_RELNOTES_URL =
-  'https://github.com/emsesp/EMS-ESP32/blob/main/CHANGELOG.md';
-const DEV_URL = 'https://github.com/emsesp/EMS-ESP32/releases/download/latest/';
-const DEV_RELNOTES_URL =
-  'https://github.com/emsesp/EMS-ESP32/blob/dev/CHANGELOG_LATEST.md';
-
-// Types for better type safety
-interface PartitionData {
-  partition: string;
-  version: string;
-  install_date?: string;
-  size: number;
-}
-
-interface VersionData {
-  emsesp_version: string;
-  arduino_version: string;
-  esp_platform: string;
-  flash_chip_size: number;
-  psram: boolean;
-  build_flags?: string;
-  partition: string;
-  partitions: PartitionData[];
-  developer_mode: boolean;
-}
-
-interface UpgradeCheckData {
-  emsesp_version: string;
-  dev_upgradeable: boolean;
-  stable_upgradeable: boolean;
-}
-
-interface VersionInfo {
-  name: string;
-  published_at?: string;
-}
-
-// Memoized components for better performance
-const VersionInfoDialog = memo(
-  ({
-    showVersionInfo,
-    latestVersion,
-    latestDevVersion,
-    partitionVersion,
-    partition,
-    currentPartition,
-    size,
-    locale,
-    LL,
-    onClose
-  }: {
-    showVersionInfo: number;
-    latestVersion?: VersionInfo;
-    latestDevVersion?: VersionInfo;
-    partitionVersion?: VersionInfo | undefined;
-    partition: string;
-    currentPartition: string;
-    size: number;
-    locale: string;
-    LL: TranslationFunctions;
-    onClose: () => void;
-  }) => {
-    if (showVersionInfo === 0) return null;
-
-    const isStable = showVersionInfo === 1;
-    const isDev = showVersionInfo === 2;
-    const isPartition = showVersionInfo === 3;
-
-    const version = isStable
-      ? latestVersion
-      : isDev
-        ? latestDevVersion
-        : partitionVersion;
-    const relNotesUrl = isStable
-      ? STABLE_RELNOTES_URL
-      : isDev
-        ? DEV_RELNOTES_URL
-        : '';
-
-    return (
-      <Dialog sx={dialogStyle} open={showVersionInfo !== 0} onClose={onClose}>
-        <DialogTitle>{LL.FIRMWARE_VERSION_INFO()}</DialogTitle>
-        <DialogContent dividers>
-          <Table size="small" sx={{ borderCollapse: 'collapse', minWidth: 0 }}>
-            <TableBody>
-              <TableRow sx={{ height: 24, borderBottom: 'none' }}>
-                <TableCell
-                  component="th"
-                  scope="row"
-                  sx={{
-                    color: 'lightblue',
-                    borderBottom: 'none',
-                    pr: 1,
-                    py: 0.5,
-                    fontSize: 13
-                  }}
-                >
-                  {LL.VERSION()}
-                </TableCell>
-                <TableCell sx={{ borderBottom: 'none', py: 0.5, fontSize: 13 }}>
-                  {isPartition
-                    ? typeof version === 'string'
-                      ? version
-                      : version?.name
-                    : version?.name}
-                </TableCell>
-              </TableRow>
-              <TableRow sx={{ height: 24, borderBottom: 'none' }}>
-                <TableCell
-                  component="th"
-                  scope="row"
-                  sx={{
-                    color: 'lightblue',
-                    borderBottom: 'none',
-                    pr: 1,
-                    py: 0.5,
-                    fontSize: 13,
-                    width: 140
-                  }}
-                >
-                  {isPartition ? LL.TYPE(0) : LL.RELEASE_TYPE()}
-                </TableCell>
-                <TableCell sx={{ borderBottom: 'none', py: 0.5, fontSize: 13 }}>
-                  {partition === currentPartition && LL.ACTIVE() + ' '}
-                  {isStable
-                    ? LL.STABLE()
-                    : isDev
-                      ? LL.DEVELOPMENT()
-                      : 'Partition ' + LL.VERSION()}
-                </TableCell>
-              </TableRow>
-              {isPartition && (
-                <TableRow sx={{ height: 24, borderBottom: 'none' }}>
-                  <TableCell
-                    component="th"
-                    scope="row"
-                    sx={{
-                      color: 'lightblue',
-                      borderBottom: 'none',
-                      pr: 1,
-                      py: 0.5,
-                      fontSize: 13
-                    }}
-                  >
-                    Partition
-                  </TableCell>
-                  <TableCell sx={{ borderBottom: 'none', py: 0.5, fontSize: 13 }}>
-                    {partition}
-                  </TableCell>
-                </TableRow>
-              )}
-              {isPartition && (
-                <TableRow sx={{ height: 24, borderBottom: 'none' }}>
-                  <TableCell
-                    component="th"
-                    scope="row"
-                    sx={{
-                      color: 'lightblue',
-                      borderBottom: 'none',
-                      pr: 1,
-                      py: 0.5,
-                      fontSize: 13
-                    }}
-                  >
-                    Size
-                  </TableCell>
-                  <TableCell sx={{ borderBottom: 'none', py: 0.5, fontSize: 13 }}>
-                    {size} KB
-                  </TableCell>
-                </TableRow>
-              )}
-              {version?.published_at && (
-                <TableRow sx={{ height: 24, borderBottom: 'none' }}>
-                  <TableCell
-                    component="th"
-                    scope="row"
-                    sx={{
-                      color: 'lightblue',
-                      borderBottom: 'none',
-                      pr: 1,
-                      py: 0.5,
-                      fontSize: 13
-                    }}
-                  >
-                    {isPartition ? 'Install Date' : 'Build Date'}
-                  </TableCell>
-                  <TableCell sx={{ borderBottom: 'none', py: 0.5, fontSize: 13 }}>
-                    {prettyDateTime(locale, new Date(version.published_at))}
-                  </TableCell>
-                </TableRow>
-              )}
-            </TableBody>
-          </Table>
-        </DialogContent>
-        <DialogActions>
-          {!isPartition && (
-            <Button
-              variant="outlined"
-              component="a"
-              href={relNotesUrl}
-              target="_blank"
-              color="primary"
-            >
-              Changelog
-            </Button>
-          )}
-          <Button variant="outlined" onClick={onClose} color="secondary">
-            {LL.CLOSE()}
-          </Button>
-        </DialogActions>
-      </Dialog>
-    );
-  }
-);
-
-const InstallDialog = memo(
-  ({
-    openInstallDialog,
-    fetchDevVersion,
-    latestVersion,
-    latestDevVersion,
-    upgradeImportantMessageType,
-    downloadOnly,
-    platform,
-    LL,
-    onClose,
-    onInstall
-  }: {
-    openInstallDialog: boolean;
-    fetchDevVersion: boolean;
-    latestVersion?: VersionInfo;
-    latestDevVersion?: VersionInfo;
-    upgradeImportantMessageType: number;
-    downloadOnly: boolean;
-    platform: string;
-    LL: TranslationFunctions;
-    onClose: () => void;
-    onInstall: (url: string) => void;
-  }) => {
-    const binURL = useMemo(() => {
-      if (!latestVersion || !latestDevVersion) return '';
-
-      const version = fetchDevVersion ? latestDevVersion : latestVersion;
-      const filename = `EMS-ESP-${version.name.replaceAll('.', '_')}-${platform}.bin`;
-
-      return fetchDevVersion
-        ? `${DEV_URL}${filename}`
-        : `${STABLE_URL}v${version.name}/${filename}`;
-    }, [fetchDevVersion, latestVersion, latestDevVersion, platform]);
-
-    return (
-      <Dialog sx={dialogStyle} open={openInstallDialog} onClose={onClose}>
-        <DialogTitle>
-          {`${LL.INSTALL()} ${fetchDevVersion ? LL.DEVELOPMENT() : LL.STABLE()} Firmware`}
-        </DialogTitle>
-        <DialogContent dividers>
-          <Typography sx={{ mb: 2 }}>
-            {LL.INSTALL_VERSION(
-              downloadOnly ? LL.DOWNLOAD(1) : LL.INSTALL(),
-              fetchDevVersion ? latestDevVersion?.name : latestVersion?.name
-            )}
-          </Typography>
-          {upgradeImportantMessageType === 2 && LL.UPGRADE_IMPORTANT_MESSAGES_2()}
-          {upgradeImportantMessageType === 1 && (
-            <>
-              {LL.UPGRADE_IMPORTANT_MESSAGES_1()}
-              <Typography sx={{ mt: 2 }}>
-                <Link to="/settings/downloadUpload" style={{ color: 'lightblue' }}>
-                  {LL.DOWNLOAD_SYSTEM_BACKUP()}
-                </Link>
-              </Typography>
-            </>
-          )}
-          <Typography sx={{ mt: 2 }}>
-            <Link
-              to="https://docs.emsesp.org/FAQ#upgrading-the-firmware"
-              target="_blank"
-              rel="noreferrer"
-              style={{ color: 'lightblue' }}
-            >
-              {LL.ONLINE_HELP()}
-            </Link>
-          </Typography>
-        </DialogContent>
-        <DialogActions>
-          <Button
-            startIcon={<CancelIcon />}
-            variant="outlined"
-            onClick={onClose}
-            color="secondary"
-          >
-            {LL.CANCEL()}
-          </Button>
-          <Button
-            startIcon={<DownloadIcon />}
-            variant="outlined"
-            onClick={onClose}
-            color="primary"
-          >
-            <Link
-              to={binURL}
-              target="_blank"
-              rel="noreferrer"
-              style={{ color: 'lightblue', textDecoration: 'none' }}
-            >
-              {LL.DOWNLOAD(0)}
-            </Link>
-          </Button>
-          {!downloadOnly && (
-            <Button
-              startIcon={<WarningIcon color="warning" />}
-              variant="outlined"
-              onClick={() => onInstall(binURL)}
-              color="primary"
-            >
-              {LL.INSTALL()}
-            </Button>
-          )}
-        </DialogActions>
-      </Dialog>
-    );
-  }
-);
-
-const InstallPartitionDialog = memo(
-  ({
-    openInstallPartitionDialog,
-    version,
-    partition,
-    LL,
-    onClose,
-    onInstall
-  }: {
-    openInstallPartitionDialog: boolean;
-    version: string;
-    partition: string;
-    LL: TranslationFunctions;
-    onClose: () => void;
-    onInstall: (partition: string) => void;
-  }) => {
-    return (
-      <Dialog sx={dialogStyle} open={openInstallPartitionDialog} onClose={onClose}>
-        <DialogTitle>
-          {LL.INSTALL()} {LL.STORED_VERSIONS()}
-        </DialogTitle>
-        <DialogContent dividers>
-          <Typography sx={{ mb: 2 }}>
-            {LL.INSTALL_VERSION(LL.INSTALL(), version)}
-          </Typography>
-        </DialogContent>
-        <DialogActions>
-          <Button
-            startIcon={<CancelIcon />}
-            variant="outlined"
-            onClick={onClose}
-            color="secondary"
-          >
-            {LL.CANCEL()}
-          </Button>
-
-          <Button
-            startIcon={<WarningIcon color="warning" />}
-            variant="outlined"
-            onClick={() => onInstall(partition)}
-            color="primary"
-          >
-            {LL.INSTALL()}
-          </Button>
-        </DialogActions>
-      </Dialog>
-    );
-  }
-);
-
-// Helper function moved outside component
-const getPlatform = (data: VersionData): string => {
-  return `${data.esp_platform}-${data.flash_chip_size >= 16384 ? '16MB' : '4MB'}${data.psram ? '+' : ''}`;
-};
-
-const Version = () => {
-  const { LL, locale } = useI18nContext();
-  const { me } = useContext(AuthenticatedContext);
-
-  // State management
-  const [restarting, setRestarting] = useState<boolean>(false);
-  const [openInstallDialog, setOpenInstallDialog] = useState<boolean>(false);
-
-  const [partitionVersion, setPartitionVersion] = useState<VersionInfo | undefined>(
-    undefined
-  );
-  const [partition, setPartition] = useState<string>('');
-  const [openInstallPartitionDialog, setOpenInstallPartitionDialog] =
-    useState<boolean>(false);
-
-  const [usingDevVersion, setUsingDevVersion] = useState<boolean>(false);
-  const [fetchDevVersion, setFetchDevVersion] = useState<boolean>(false);
-  const [devUpgradeAvailable, setDevUpgradeAvailable] = useState<boolean>(false);
-  const [stableUpgradeAvailable, setStableUpgradeAvailable] =
-    useState<boolean>(false);
-  const [internetLive, setInternetLive] = useState<boolean>(false);
-  const [downloadOnly, setDownloadOnly] = useState<boolean>(false);
-  const [showVersionInfo, setShowVersionInfo] = useState<number>(0); // 1 = stable, 2 = dev, 3 = partition
-  const [firmwareSize, setFirmwareSize] = useState<number>(0);
-
-  const { send: sendCheckUpgrade } = useRequest(
-    (versions: string) => callAction({ action: 'checkUpgrade', param: versions }),
-    { immediate: false }
-  ).onSuccess((event) => {
-    const data = event.data as UpgradeCheckData;
-    setDevUpgradeAvailable(data.dev_upgradeable);
-    setStableUpgradeAvailable(data.stable_upgradeable);
-  });
-
-  const { send: sendSetPartition } = useRequest(
-    (partition: string) => callAction({ action: 'setPartition', param: partition }),
-    { immediate: false }
-  ).onError((error) => {
-    toast.error(String(error.error?.message || 'An error occurred'));
-  });
-
-  const {
-    data,
-    send: loadData,
-    error
-  } = useRequest(SystemApi.readSystemStatus).onSuccess((event) => {
-    const systemData = event.data as VersionData;
-    if (systemData.arduino_version.startsWith('Tasmota')) {
-      setDownloadOnly(true);
-    }
-    setUsingDevVersion(systemData.emsesp_version.includes('dev'));
-  });
-
-  const { send: sendUploadURL } = useRequest(
-    (url: string) => callAction({ action: 'uploadURL', param: url }),
-    { immediate: false }
-  );
-
-  const { data: latestVersion } = useRequest(getStableVersion);
-  const { data: latestDevVersion } = useRequest(getDevVersion);
-
-  const { send: sendAPI } = useRequest((data: APIcall) => API(data), {
-    immediate: false
-  });
-
-  const [upgradeImportantMessageType, setUpgradeImportantMessageType] =
-    useState<number>(0);
-
-  const { send: checkUpgradeImportantMessages } = useRequest(
-    (version: string) =>
-      callAction({ action: 'upgradeImportantMessages', param: version }),
-    {
-      immediate: false
-    }
-  )
-    .onSuccess((event) => {
-      const upgradeImportantMessageType_n = (
-        event.data as { upgradeImportantMessageType: number }
-      ).upgradeImportantMessageType;
-      setUpgradeImportantMessageType(upgradeImportantMessageType_n);
-    })
-    .onError((error) => {
-      toast.error(String(error.error?.message || 'An error occurred'));
-    });
-
-  // Memoized values
-  const platform = useMemo(() => (data ? getPlatform(data) : ''), [data]);
-
-  // Memoize filtered partitions to avoid recomputing on every render
-  const otherPartitions = useMemo(
-    () => data?.partitions.filter((p) => p.partition !== data.partition) ?? [],
-    [data]
-  );
-
-  const setPartitionVersionInfo = useCallback(
-    (partition: string) => {
-      setShowVersionInfo(3);
-
-      // search for the partition in the data.partitions array
-      const partitionData = data?.partitions.find((p) => p.partition === partition);
-      if (partitionData) {
-        setPartitionVersion({
-          name: partitionData.version,
-          published_at: partitionData.install_date ?? ''
-        });
-        setPartition(partitionData.partition);
-        setFirmwareSize(partitionData.size);
-      }
-    },
-    [data]
-  );
-
-  const doRestart = useCallback(async () => {
-    await sendAPI({ device: 'system', cmd: 'restart', id: 0 }).catch(
-      (error: Error) => {
-        toast.error(error.message);
-      }
-    );
-    setRestarting(true);
-  }, [sendAPI]);
-
-  const installFirmwareURL = useCallback(
-    async (url: string) => {
-      await sendUploadURL(url).catch((error: Error) => {
-        toast.error(error.message);
-      });
-      await doRestart();
-    },
-    [sendUploadURL, doRestart]
-  );
-
-  const installPartitionFirmware = useCallback(
-    async (partition: string) => {
-      await sendSetPartition(partition).catch((error: Error) => {
-        toast.error(error.message);
-      });
-      setRestarting(true);
-    },
-    [sendSetPartition]
-  );
-
-  const showPartitionDialog = useCallback(
-    (version: string, partition: string, install_date: string) => {
-      setOpenInstallPartitionDialog(true);
-      setPartitionVersion({ name: version, published_at: install_date });
-      setPartition(partition);
-    },
-    []
-  );
-
-  const showFirmwareDialog = useCallback(
-    (useDevVersion: boolean) => {
-      setFetchDevVersion(useDevVersion);
-      void checkUpgradeImportantMessages(
-        useDevVersion ? latestDevVersion?.name : latestVersion?.name
-      );
-      setOpenInstallDialog(true);
-    },
-    [latestDevVersion, latestVersion, fetchDevVersion]
-  );
-
-  const closeInstallDialog = useCallback(() => {
-    setOpenInstallDialog(false);
-  }, []);
-
-  const closeInstallPartitionDialog = useCallback(() => {
-    setOpenInstallPartitionDialog(false);
-  }, []);
-
-  const handleVersionInfoClose = useCallback(() => {
-    setShowVersionInfo(0);
-    setPartitionVersion(undefined);
-    setPartition('');
-  }, []);
-
-  // check upgrades - only once when both versions are available
-  const upgradeCheckedRef = useRef(false);
-  useEffect(() => {
-    if (latestVersion && latestDevVersion && !upgradeCheckedRef.current) {
-      upgradeCheckedRef.current = true;
-      const versions = `${latestDevVersion.name},${latestVersion.name}`;
-      sendCheckUpgrade(versions)
-        .catch((error: Error) => {
-          toast.error(`Failed to check for upgrades: ${error.message}`);
-        })
-        .finally(() => {
-          setInternetLive(true);
-        });
-    }
-  }, [latestVersion, latestDevVersion, sendCheckUpgrade]);
-
-  useLayoutTitle('EMS-ESP Firmware');
-
-  // Memoized button rendering logic
-  const showButtons = useCallback(
-    (showingDev: boolean) => {
-      const choice = showingDev
-        ? !usingDevVersion
-          ? LL.SWITCH_RELEASE_TYPE(LL.DEVELOPMENT())
-          : devUpgradeAvailable
-            ? LL.UPDATE_AVAILABLE()
-            : undefined
-        : usingDevVersion
-          ? LL.SWITCH_RELEASE_TYPE(LL.STABLE())
-          : stableUpgradeAvailable
-            ? LL.UPDATE_AVAILABLE()
-            : undefined;
-
-      if (!choice) {
-        return (
-          <>
-            <CheckIcon
-              color="success"
-              sx={{ verticalAlign: 'middle', ml: 0.5, mr: 0.5 }}
-            />
-            <span style={{ color: '#66bb6a', fontSize: '0.8em' }}>
-              {LL.LATEST_VERSION(usingDevVersion ? LL.DEVELOPMENT() : LL.STABLE())}
-            </span>
-            <Button
-              sx={{ ml: 1 }}
-              variant="outlined"
-              size="small"
-              onClick={() => showFirmwareDialog(showingDev)}
-            >
-              {LL.REINSTALL()}
-            </Button>
-          </>
-        );
-      }
-
-      if (!me.admin) return null;
-
-      return (
-        <Button
-          sx={{ ml: 1 }}
-          variant="outlined"
-          color={choice === LL.UPDATE_AVAILABLE() ? 'success' : 'warning'}
-          size="small"
-          onClick={() => showFirmwareDialog(showingDev)}
-        >
-          {choice}
-        </Button>
-      );
-    },
-    [
-      usingDevVersion,
-      devUpgradeAvailable,
-      stableUpgradeAvailable,
-      me.admin,
-      LL,
-      showFirmwareDialog
-    ]
-  );
-
-  const content = useMemo(() => {
-    if (!data) {
-      return <FormLoader onRetry={loadData} errorMessage={error?.message || ''} />;
-    }
-
-    return (
-      <>
-        <Box sx={{ p: 2, border: '1px solid #565656', borderRadius: 2 }}>
-          <Typography sx={{ mb: 1 }} variant="h6" color="primary">
-            {LL.THIS_VERSION()}
-          </Typography>
-
-          <Grid
-            container
-            direction="row"
-            sx={{
-              justifyContent: 'flex-start',
-              alignItems: 'baseline'
-            }}
-          >
-            <Grid size={{ xs: 4, md: 2 }}>
-              <Typography color="secondary">{LL.VERSION()}</Typography>
-            </Grid>
-            <Grid size={{ xs: 8, md: 10 }}>
-              <Typography>
-                {data.emsesp_version}
-                {data.build_flags && (
-                  <Typography variant="caption">
-                    &nbsp; &#40;{data.build_flags}&#41;
-                  </Typography>
-                )}
-                <IconButton
-                  onClick={() => setPartitionVersionInfo(data.partition)}
-                  aria-label={LL.FIRMWARE_VERSION_INFO()}
-                >
-                  <InfoOutlinedIcon color="primary" sx={{ fontSize: 18 }} />
-                </IconButton>
-              </Typography>
-            </Grid>
-
-            <Grid size={{ xs: 4, md: 2 }}>
-              <Typography color="secondary">{LL.PLATFORM()}</Typography>
-            </Grid>
-            <Grid size={{ xs: 8, md: 10 }}>
-              <Typography>
-                {platform}
-                <Typography variant="caption">
-                  &nbsp; &#40;
-                  {data.psram ? (
-                    <CheckIcon
-                      color="success"
-                      sx={{
-                        fontSize: '1.5em',
-                        verticalAlign: 'middle'
-                      }}
-                    />
-                  ) : (
-                    <CloseIcon
-                      color="error"
-                      sx={{
-                        fontSize: '1.5em',
-                        verticalAlign: 'middle'
-                      }}
-                    />
-                  )}
-                  PSRAM&#41;
-                </Typography>
-              </Typography>
-            </Grid>
-          </Grid>
-
-          {internetLive ? (
-            <>
-              <Typography sx={{ mt: 4, mb: 1 }} variant="h6" color="primary">
-                {LL.AVAILABLE_VERSION()}
-              </Typography>
-
-              <Grid
-                container
-                direction="row"
-                rowSpacing={1}
-                sx={{
-                  justifyContent: 'flex-start',
-                  alignItems: 'baseline'
-                }}
-              >
-                {otherPartitions.length > 0 && data.developer_mode && (
-                  <>
-                    <Grid size={{ xs: 4, md: 2 }}>
-                      <Typography color="secondary">
-                        {LL.STORED_VERSIONS()}
-                      </Typography>
-                    </Grid>
-                    <Grid size={{ xs: 8, md: 10 }}>
-                      {otherPartitions.map((partition) => (
-                        <Typography key={partition.partition} sx={{ mb: 1 }}>
-                          {partition.version}
-                          <IconButton
-                            onClick={() =>
-                              setPartitionVersionInfo(partition.partition)
-                            }
-                            aria-label={LL.FIRMWARE_VERSION_INFO()}
-                          >
-                            <InfoOutlinedIcon
-                              color="primary"
-                              sx={{ fontSize: 18 }}
-                            />
-                          </IconButton>
-                          <Button
-                            sx={{ ml: 0 }}
-                            variant="outlined"
-                            size="small"
-                            onClick={() =>
-                              showPartitionDialog(
-                                partition.version,
-                                partition.partition,
-                                partition.install_date ?? ''
-                              )
-                            }
-                          >
-                            {LL.INSTALL()}
-                          </Button>
-                        </Typography>
-                      ))}
-                    </Grid>
-                  </>
-                )}
-                <Grid size={{ xs: 4, md: 2 }}>
-                  <Typography color="secondary">{LL.STABLE()}</Typography>
-                </Grid>
-                <Grid size={{ xs: 8, md: 10 }}>
-                  <Typography>
-                    {latestVersion?.name}
-                    <IconButton
-                      onClick={() => setShowVersionInfo(1)}
-                      aria-label={LL.FIRMWARE_VERSION_INFO()}
-                    >
-                      <InfoOutlinedIcon color="primary" sx={{ fontSize: 18 }} />
-                    </IconButton>
-                    {showButtons(false)}
-                  </Typography>
-                </Grid>
-
-                <Grid size={{ xs: 4, md: 2 }}>
-                  <Typography color="secondary">{LL.DEVELOPMENT()}</Typography>
-                </Grid>
-                <Grid size={{ xs: 8, md: 10 }}>
-                  <Typography>
-                    {latestDevVersion?.name}
-                    <IconButton
-                      onClick={() => setShowVersionInfo(2)}
-                      aria-label={LL.FIRMWARE_VERSION_INFO()}
-                    >
-                      <InfoOutlinedIcon color="primary" sx={{ fontSize: 18 }} />
-                    </IconButton>
-                    {showButtons(true)}
-                  </Typography>
-                </Grid>
-              </Grid>
-            </>
-          ) : (
-            <Typography sx={{ mt: 2 }} color="warning">
-              <WarningIcon color="warning" sx={{ verticalAlign: 'middle', mr: 2 }} />
-              {LL.INTERNET_CONNECTION_REQUIRED()}
-            </Typography>
-          )}
-          {me.admin && (
-            <>
-              <VersionInfoDialog
-                showVersionInfo={showVersionInfo}
-                latestVersion={latestVersion}
-                latestDevVersion={latestDevVersion}
-                partitionVersion={partitionVersion}
-                locale={locale}
-                partition={partition}
-                currentPartition={data?.partition ?? ''}
-                size={firmwareSize}
-                LL={LL}
-                onClose={handleVersionInfoClose}
-              />
-              <InstallDialog
-                openInstallDialog={openInstallDialog}
-                fetchDevVersion={fetchDevVersion}
-                latestVersion={latestVersion}
-                latestDevVersion={latestDevVersion}
-                upgradeImportantMessageType={upgradeImportantMessageType}
-                downloadOnly={downloadOnly}
-                platform={platform}
-                LL={LL}
-                onClose={closeInstallDialog}
-                onInstall={installFirmwareURL}
-              />
-              <InstallPartitionDialog
-                openInstallPartitionDialog={openInstallPartitionDialog}
-                version={partitionVersion?.name || ''}
-                partition={partition}
-                LL={LL}
-                onClose={closeInstallPartitionDialog}
-                onInstall={installPartitionFirmware}
-              />
-              <Typography sx={{ pt: 2, pb: 2 }} variant="h6" color="primary">
-                {LL.UPLOAD()}
-              </Typography>
-              <SingleUpload doRestart={doRestart} />
-            </>
-          )}
-        </Box>
-      </>
-    );
-  }, [
-    data,
-    error,
-    loadData,
-    LL,
-    platform,
-    internetLive,
-    latestVersion,
-    latestDevVersion,
-    showVersionInfo,
-    locale,
-    openInstallDialog,
-    fetchDevVersion,
-    downloadOnly,
-    me.admin,
-    showButtons,
-    handleVersionInfoClose,
-    closeInstallDialog,
-    installFirmwareURL,
-    doRestart,
-    otherPartitions,
-    setPartitionVersionInfo,
-    showPartitionDialog,
-    partitionVersion,
-    partition,
-    firmwareSize,
-    closeInstallPartitionDialog,
-    installPartitionFirmware
-  ]);
-
-  return restarting ? <SystemMonitor /> : <SectionContent>{content}</SectionContent>;
-};
-
-export default memo(Version);
@@ -1,4 +1,4 @@
-import { type FC, type PropsWithChildren, memo, useMemo } from 'react';
+import { type FC, type PropsWithChildren, memo } from 'react';

 import CheckCircleOutlineOutlinedIcon from '@mui/icons-material/CheckCircleOutlineOutlined';
 import ErrorIcon from '@mui/icons-material/Error';
@@ -38,18 +38,17 @@ const MessageBox: FC<PropsWithChildren<MessageBoxProps>> = ({
 }) => {
  const theme = useTheme();

-  const { Icon, backgroundColor } = useMemo(() => {
-    const Icon = LEVEL_ICONS[level];
-    const palettePath = LEVEL_PALETTE_PATHS[level];
-    const [key, shade] = palettePath.split('.') as [
-      keyof typeof theme.palette,
-      string
-    ];
-    const paletteKey = theme.palette[key] as unknown as Record<string, string>;
-    const backgroundColor = paletteKey[shade];
-
-    return { Icon, backgroundColor };
-  }, [level, theme]);
+  const Icon = LEVEL_ICONS[level];
+  const palettePath = LEVEL_PALETTE_PATHS[level];
+  const [paletteKeyName, shade] = palettePath.split('.') as [
+    keyof typeof theme.palette,
+    string
+  ];
+  const paletteKey = theme.palette[paletteKeyName] as unknown as Record<
+    string,
+    string
+  >;
+  const backgroundColor = paletteKey[shade];

  return (
    <Box
@@ -1,10 +1,10 @@
-import { memo, useCallback, useContext, useMemo } from 'react';
+import { memo, useContext } from 'react';
 import type { ChangeEventHandler } from 'react';
 import type { CSSProperties } from 'react';

 import { MenuItem, TextField } from '@mui/material';

-import CZflag from 'i18n/CZ.svg';
+import CZflag from 'i18n/CS.svg';
 import DEflag from 'i18n/DE.svg';
 import FRflag from 'i18n/FR.svg';
 import GBflag from 'i18n/GB.svg';
@@ -44,27 +44,14 @@ const LANGUAGE_OPTIONS: LanguageOption[] = [
 const LanguageSelector = () => {
  const { setLocale, locale, LL } = useContext(I18nContext);

-  const onLocaleSelected: ChangeEventHandler<HTMLInputElement> = useCallback(
-    async ({ target }) => {
-      const loc = target.value as Locales;
-      localStorage.setItem('lang', loc);
-      await loadLocaleAsync(loc);
-      setLocale(loc);
-    },
-    [setLocale]
-  );
-
-  // Memoize menu items to prevent recreation on every render
-  const menuItems = useMemo(
-    () =>
-      LANGUAGE_OPTIONS.map(({ key, flag, label }) => (
-        <MenuItem key={key} value={key}>
-          <img src={flag} style={flagStyle} alt={label} />
-          &nbsp;{label}
-        </MenuItem>
-      )),
-    []
-  );
+  const onLocaleSelected: ChangeEventHandler<HTMLInputElement> = async ({
+    target
+  }) => {
+    const loc = target.value as Locales;
+    localStorage.setItem('lang', loc);
+    await loadLocaleAsync(loc);
+    setLocale(loc);
+  };

  return (
    <TextField
@@ -76,7 +63,12 @@ const LanguageSelector = () => {
      size="small"
      select
    >
-      {menuItems}
+      {LANGUAGE_OPTIONS.map(({ key, flag, label }) => (
+        <MenuItem key={key} value={key}>
+          <img src={flag} style={flagStyle} alt={label} />
+          &nbsp;{label}
+        </MenuItem>
+      ))}
    </TextField>
  );
 };
@@ -1,4 +1,4 @@
-import { memo, useCallback, useState } from 'react';
+import { memo, useState } from 'react';
 import type { FC } from 'react';

 import VisibilityIcon from '@mui/icons-material/Visibility';
@@ -13,9 +13,9 @@ type ValidatedPasswordFieldProps = Omit<ValidatedTextFieldProps, 'type'>;
 const ValidatedPasswordField: FC<ValidatedPasswordFieldProps> = ({ ...props }) => {
  const [showPassword, setShowPassword] = useState<boolean>(false);

-  const togglePasswordVisibility = useCallback(() => {
+  const togglePasswordVisibility = () => {
    setShowPassword((prev) => !prev);
-  }, []);
+  };

  return (
    <ValidatedTextField
@@ -4,7 +4,7 @@ import type { FC } from 'react';
 import { FormHelperText, TextField } from '@mui/material';
 import type { TextFieldProps } from '@mui/material';

-import type { ValidateFieldsError } from 'async-validator';
+import type { ValidateFieldsError } from 'validators/schema';

 interface ValidatedFieldProps {
  fieldErrors?: ValidateFieldsError;
@@ -18,7 +18,6 @@ const LayoutComponent: FC<RequiredChildrenProps> = ({ children }) => {
  const [title, setTitle] = useState(PROJECT_NAME);
  const { pathname } = useLocation();

-  // Memoize drawer toggle handler to prevent unnecessary re-renders
  const handleDrawerToggle = useCallback(() => {
    setMobileOpen((prev) => !prev);
  }, []);
@@ -28,7 +27,6 @@ const LayoutComponent: FC<RequiredChildrenProps> = ({ children }) => {
    setMobileOpen(false);
  }, [pathname]);

-  // Memoize context value to prevent unnecessary re-renders
  const contextValue = useMemo(() => ({ title, setTitle }), [title]);

  return (
@@ -1,4 +1,4 @@
-import { memo, useCallback, useMemo } from 'react';
+import { memo } from 'react';
 import { Link, useLocation, useNavigate } from 'react-router';

 import ArrowBackIcon from '@mui/icons-material/ArrowBack';
@@ -39,14 +39,11 @@ const LayoutAppBarComponent = ({ title, onToggleDrawer }: LayoutAppBarProps) =>
  const navigate = useNavigate();
  const location = useLocation();

-  const pathnames = useMemo(
-    () => location.pathname.split('/').filter((x) => x),
-    [location.pathname]
-  );
+  const pathnames = location.pathname.split('/').filter((x) => x);

-  const handleBackClick = useCallback(() => {
+  const handleBackClick = () => {
    void navigate('/' + pathnames[0]);
-  }, [navigate, pathnames]);
+  };

  return (
    <AppBar position="fixed" sx={appBarStyles}>
@@ -1,7 +1,8 @@
-import { memo, useMemo } from 'react';
+import { memo, useContext } from 'react';

 import { Box, Divider, Drawer, Toolbar, Typography, styled } from '@mui/material';

+import { AuthenticatedContext } from 'contexts/authentication';
 import { PROJECT_NAME } from 'env';

 import { DRAWER_WIDTH } from './Layout';
@@ -24,22 +25,33 @@ interface LayoutDrawerProps {
 }

 const LayoutDrawerComponent = ({ mobileOpen, onClose }: LayoutDrawerProps) => {
-  // Memoize drawer content to prevent unnecessary re-renders
-  const drawer = useMemo(
-    () => (
-      <>
-        <Toolbar disableGutters>
-          <Box sx={{ display: 'flex', alignItems: 'center', p: 2 }}>
-            <LayoutDrawerLogo src="/app/icon.png" alt={PROJECT_NAME} />
-            <Typography variant="h6">{PROJECT_NAME}</Typography>
+  const { systemName } = useContext(AuthenticatedContext);
+
+  const drawer = (
+    <>
+      <Toolbar disableGutters>
+        <Box sx={{ display: 'flex', alignItems: 'center', p: 2 }}>
+          <LayoutDrawerLogo src="/app/icon.png" alt={PROJECT_NAME} />
+          <Box
+            sx={{
+              display: 'flex',
+              flexDirection: 'column',
+              justifyContent: 'center'
+            }}
+          >
+            <Typography>{PROJECT_NAME}</Typography>
+            {systemName && (
+              <Typography color="secondary" variant="body2">
+                {systemName}
+              </Typography>
+            )}
          </Box>
-          <Divider absolute />
-        </Toolbar>
-        <Divider />
-        <LayoutMenu />
-      </>
-    ),
-    []
+        </Box>
+        <Divider absolute />
+      </Toolbar>
+      <Divider />
+      <LayoutMenu />
+    </>
  );

  return (
@@ -1,4 +1,4 @@
-import { memo, useCallback, useContext, useState } from 'react';
+import { memo, useContext, useState } from 'react';

 import AccountCircleIcon from '@mui/icons-material/AccountCircle';
 import AssessmentIcon from '@mui/icons-material/Assessment';
@@ -8,6 +8,7 @@ import KeyboardArrowDown from '@mui/icons-material/KeyboardArrowDown';
 import LiveHelpIcon from '@mui/icons-material/LiveHelp';
 import MoreTimeIcon from '@mui/icons-material/MoreTime';
 import PlaylistAddIcon from '@mui/icons-material/PlaylistAdd';
+import PlaylistPlayIcon from '@mui/icons-material/PlaylistPlay';
 import SensorsIcon from '@mui/icons-material/Sensors';
 import SettingsIcon from '@mui/icons-material/Settings';
 import StarIcon from '@mui/icons-material/Star';
@@ -18,13 +19,15 @@ import { AuthenticatedContext } from 'contexts/authentication';
 import { useI18nContext } from 'i18n/i18n-react';

 const LayoutMenuComponent = () => {
-  const { me } = useContext(AuthenticatedContext);
+  const { me, versions } = useContext(AuthenticatedContext);
  const { LL } = useI18nContext();
  const [menuOpen, setMenuOpen] = useState(true);

-  const handleMenuToggle = useCallback(() => {
+  const upgradeAvailable = versions?.current?.upgradeable ?? false;
+
+  const handleMenuToggle = () => {
    setMenuOpen((prev) => !prev);
-  }, []);
+  };

  return (
    <>
@@ -78,6 +81,12 @@ const LayoutMenuComponent = () => {
                disabled={!me.admin}
                to={`/customizations`}
              />
+              <LayoutMenuItem
+                icon={PlaylistPlayIcon}
+                label={LL.COMMANDS()}
+                disabled={!me.admin}
+                to={`/commands`}
+              />
              <LayoutMenuItem
                icon={MoreTimeIcon}
                label={LL.SCHEDULER()}
@@ -105,6 +114,7 @@ const LayoutMenuComponent = () => {
          label={LL.SETTINGS(0)}
          disabled={!me.admin}
          to="/settings"
+          badge={upgradeAvailable}
        />
        <LayoutMenuItem icon={LiveHelpIcon} label={LL.HELP()} to={`/help`} />
        <Divider />
@@ -1,7 +1,7 @@
-import { memo, useMemo } from 'react';
+import { memo } from 'react';
 import { Link, useLocation } from 'react-router';

-import { ListItemButton, ListItemIcon, ListItemText } from '@mui/material';
+import { Box, ListItemButton, ListItemIcon, ListItemText } from '@mui/material';
 import type { SvgIconProps, SxProps, Theme } from '@mui/material';

 import { routeMatches } from 'utils';
@@ -11,60 +11,52 @@ interface LayoutMenuItemProps {
  label: string;
  to: string;
  disabled?: boolean;
+  badge?: boolean;
 }

 const LayoutMenuItemComponent = ({
  icon: Icon,
  label,
  to,
-  disabled
+  disabled,
+  badge
 }: LayoutMenuItemProps) => {
  const { pathname } = useLocation();

-  const selected = useMemo(() => routeMatches(to, pathname), [to, pathname]);
+  const selected = routeMatches(to, pathname);

-  // Memoize dynamic styles based on selected state
-  const buttonStyles: SxProps<Theme> = useMemo(
-    () => ({
-      transition: 'all 0.05s cubic-bezier(0.55, 0.085, 0.68, 0.53)',
-      backgroundColor: selected ? 'rgba(144, 202, 249, 0.1)' : 'transparent',
-      borderRadius: '8px',
-      margin: '2px 8px',
-      '&:hover': {
-        backgroundColor: 'rgba(68, 82, 211, 0.39)'
-      },
-      '&::before': {
-        content: '""',
-        position: 'absolute',
-        left: 0,
-        top: 0,
-        bottom: 0,
-        width: selected ? '3px' : '0px',
-        backgroundColor: '#90caf9',
-        transition: 'width 0.05s cubic-bezier(0.55, 0.085, 0.68, 0.53)'
-      }
-    }),
-    [selected]
-  );
+  const buttonStyles: SxProps<Theme> = {
+    transition: 'all 0.05s cubic-bezier(0.55, 0.085, 0.68, 0.53)',
+    backgroundColor: selected ? 'rgba(144, 202, 249, 0.1)' : 'transparent',
+    borderRadius: '8px',
+    margin: '2px 8px',
+    '&:hover': {
+      backgroundColor: 'rgba(68, 82, 211, 0.39)'
+    },
+    '&::before': {
+      content: '""',
+      position: 'absolute',
+      left: 0,
+      top: 0,
+      bottom: 0,
+      width: selected ? '3px' : '0px',
+      backgroundColor: '#90caf9',
+      transition: 'width 0.05s cubic-bezier(0.55, 0.085, 0.68, 0.53)'
+    }
+  };

-  const iconStyles: SxProps<Theme> = useMemo(
-    () => ({
-      color: selected ? '#90caf9' : '#9e9e9e',
-      transition: 'color 0.05s cubic-bezier(0.55, 0.085, 0.68, 0.53)',
-      transform: selected ? 'scale(1.1)' : 'scale(1)',
-      transitionProperty: 'color, transform'
-    }),
-    [selected]
-  );
+  const iconStyles: SxProps<Theme> = {
+    color: selected ? '#90caf9' : '#9e9e9e',
+    transition: 'color 0.05s cubic-bezier(0.55, 0.085, 0.68, 0.53)',
+    transform: selected ? 'scale(1.1)' : 'scale(1)',
+    transitionProperty: 'color, transform'
+  };

-  const textStyles: SxProps<Theme> = useMemo(
-    () => ({
-      color: selected ? '#90caf9' : '#f5f5f5',
-      transition: 'color 0.05s cubic-bezier(0.55, 0.085, 0.68, 0.53)',
-      transitionProperty: 'color, font-weight'
-    }),
-    [selected]
-  );
+  const textStyles: SxProps<Theme> = {
+    color: selected ? '#90caf9' : '#f5f5f5',
+    transition: 'color 0.05s cubic-bezier(0.55, 0.085, 0.68, 0.53)',
+    transitionProperty: 'color, font-weight'
+  };

  return (
    <ListItemButton
@@ -78,6 +70,20 @@ const LayoutMenuItemComponent = ({
        <Icon />
      </ListItemIcon>
      <ListItemText sx={textStyles}>{label}</ListItemText>
+      {badge && (
+        <Box
+          aria-label="update available"
+          sx={{
+            width: 8,
+            height: 8,
+            ml: 1,
+            borderRadius: '50%',
+            backgroundColor: '#ffeb3b',
+            boxShadow: '0 0 6px rgba(255, 235, 59, 0.8)',
+            flexShrink: 0
+          }}
+        />
+      )}
    </ListItemButton>
  );
 };
@@ -5,6 +5,7 @@ import { Link } from 'react-router';
 import NavigateNextIcon from '@mui/icons-material/NavigateNext';
 import {
  Avatar,
+  Box,
  ListItem,
  ListItemAvatar,
  ListItemButton,
@@ -20,6 +21,7 @@ interface ListMenuItemProps {
  text: string;
  to?: string;
  disabled?: boolean;
+  badge?: boolean;
 }

 const iconStyles: CSSProperties = {
@@ -28,15 +30,40 @@ const iconStyles: CSSProperties = {
  verticalAlign: 'middle'
 };

+const Badge = () => (
+  <Box
+    component="span"
+    aria-label="update available"
+    sx={{
+      display: 'inline-block',
+      width: 8,
+      height: 8,
+      ml: 1,
+      verticalAlign: 'middle',
+      borderRadius: '50%',
+      backgroundColor: '#ffeb3b',
+      boxShadow: '0 0 6px rgba(255, 235, 59, 0.8)'
+    }}
+  />
+);
+
 const RenderIcon = memo(
-  ({ icon: Icon, bgcolor, label, text }: ListMenuItemProps) => (
+  ({ icon: Icon, bgcolor, label, text, badge }: ListMenuItemProps) => (
    <>
      <ListItemAvatar>
        <Avatar sx={{ bgcolor, color: 'white' }}>
          <Icon />
        </Avatar>
      </ListItemAvatar>
-      <ListItemText primary={label} secondary={text} />
+      <ListItemText
+        primary={
+          <>
+            {label}
+            {badge && <Badge />}
+          </>
+        }
+        secondary={text}
+      />
    </>
  )
 );
@@ -47,7 +74,8 @@ const LayoutMenuItem = ({
  label,
  text,
  to,
-  disabled
+  disabled,
+  badge
 }: ListMenuItemProps) => (
  <>
    {to && !disabled ? (
@@ -65,6 +93,7 @@ const LayoutMenuItem = ({
            {...(bgcolor && { bgcolor })}
            label={label}
            text={text}
+            {...(badge && { badge })}
          />
        </ListItemButton>
      </ListItem>
@@ -75,6 +104,7 @@ const LayoutMenuItem = ({
          {...(bgcolor && { bgcolor })}
          label={label}
          text={text}
+          {...(badge && { badge })}
        />
      </ListItem>
    )}
@@ -1,4 +1,4 @@
-import { memo, useCallback } from 'react';
+import { memo } from 'react';
 import type { Blocker } from 'react-router';

 import {
@@ -15,13 +15,13 @@ import { useI18nContext } from 'i18n/i18n-react';
 const BlockNavigation = ({ blocker }: { blocker: Blocker }) => {
  const { LL } = useI18nContext();

-  const handleReset = useCallback(() => {
+  const handleReset = () => {
    blocker.reset?.();
-  }, [blocker]);
+  };

-  const handleProceed = useCallback(() => {
+  const handleProceed = () => {
    blocker.proceed?.();
-  }, [blocker]);
+  };

  return (
    <Dialog sx={dialogStyle} open={blocker.state === 'blocked'}>
@@ -1,17 +1,14 @@
 import { memo, useContext } from 'react';
-import type { FC } from 'react';
-import { Navigate } from 'react-router';
+import { Navigate, Outlet } from 'react-router';

 import { AuthenticatedContext } from 'contexts/authentication';
-import type { RequiredChildrenProps } from 'utils';

-const RequireAdmin: FC<RequiredChildrenProps> = ({ children }) => {
-  const authenticatedContext = useContext(AuthenticatedContext);
-  return authenticatedContext.me.admin ? (
-    <>{children}</>
-  ) : (
-    <Navigate replace to="/" />
-  );
+// Layout-route guard: renders nested admin routes only for admins, otherwise
+// redirects home. Must be used inside the authenticated route subtree so that
+// AuthenticatedContext (and `me`) is available.
+const RequireAdmin = () => {
+  const { me } = useContext(AuthenticatedContext);
+  return me.admin ? <Outlet /> : <Navigate replace to="/" />;
 };

 export default memo(RequireAdmin);
@@ -0,0 +1,35 @@
+import { memo, useContext, useEffect, useRef } from 'react';
+import { Navigate } from 'react-router';
+
+import { toast } from 'components/toast';
+import { AuthenticationContext } from 'contexts/authentication';
+import { useI18nContext } from 'i18n/i18n-react';
+
+type RootRedirectKind = 'unauthorized' | 'fileUpdated';
+
+// Shows a one-shot toast and bounces back to "/". Used by the /unauthorized and
+// /fileUpdated routes. Resolves its own i18n message so it can be used directly
+// as a static route element.
+const RootRedirect = ({ kind }: { kind: RootRedirectKind }) => {
+  const { LL } = useI18nContext();
+  const { signOut } = useContext(AuthenticationContext);
+  const hasShownToast = useRef(false);
+
+  useEffect(() => {
+    // Guard against StrictMode double-invoke / re-renders.
+    if (hasShownToast.current) return;
+    hasShownToast.current = true;
+
+    if (kind === 'unauthorized') {
+      signOut(false);
+      toast.success(LL.PLEASE_SIGNIN());
+    } else {
+      toast.success(LL.UPLOAD_SUCCESSFUL());
+    }
+    // Run once on mount.
+  }, []);
+
+  return <Navigate to="/" replace />;
+};
+
+export default memo(RootRedirect);
@@ -1,4 +1,4 @@
-import { memo, useCallback } from 'react';
+import { memo } from 'react';
 import type { FC } from 'react';
 import { useNavigate } from 'react-router';

@@ -16,12 +16,9 @@ const RouterTabs: FC<RouterTabsProps> = ({ value, children }) => {
  const theme = useTheme();
  const smallDown = useMediaQuery(theme.breakpoints.down('sm'));

-  const handleTabChange = useCallback(
-    (_event: unknown, path: string) => {
-      void navigate(path);
-    },
-    [navigate]
-  );
+  const handleTabChange = (_event: unknown, path: string) => {
+    void navigate(path);
+  };

  return (
    <Tabs
@@ -2,3 +2,4 @@ export { default as RouterTabs } from './RouterTabs';
 export { default as RequireAdmin } from './RequireAdmin';
 export { default as RequireAuthenticated } from './RequireAuthenticated';
 export { default as RequireUnauthenticated } from './RequireUnauthenticated';
+export { default as RootRedirect } from './RootRedirect';
--- a/Show More
+++ b/Show More