Add inital form data to hui-form-editor

2025-08-11 18:29:27 +00:00 · 2023-12-12 09:58:50 +01:00
1217 changed files with 33706 additions and 59206 deletions
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -1,5 +1,5 @@
 # See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.148.1/containers/python-3/.devcontainer/base.Dockerfile
-FROM mcr.microsoft.com/devcontainers/python:3.12
+FROM mcr.microsoft.com/vscode/devcontainers/python:0-3.11

 ENV \
  DEBIAN_FRONTEND=noninteractive \
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -5,7 +5,6 @@
    "context": ".."
  },
  "appPort": "8124:8123",
-  "postCreateCommand": "sudo apt update && sudo apt upgrade -y && sudo apt install -y libpcap-dev",
  "postStartCommand": "script/bootstrap",
  "containerEnv": {
    "WORKSPACE_DIRECTORY": "${containerWorkspaceFolder}"
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -115,7 +115,6 @@
      }
    ],
    "unused-imports/no-unused-imports": "error",
-    "lit/attribute-names": "warn",
    "lit/attribute-value-entities": "off",
    "lit/no-template-map": "off",
    "lit/no-native-attributes": "warn",
@@ -126,5 +125,6 @@
    "lit-a11y/anchor-is-valid": "warn",
    "lit-a11y/role-has-required-aria-attrs": "warn"
  },
-  "plugins": ["unused-imports"]
+  "plugins": ["disable", "unused-imports"],
+  "processor": "disable/disable"
 }
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -24,7 +24,6 @@ body:
          required: true
        - label: I have tried a different browser to see if it is related to my browser.
          required: true
-        - label: I have tried reproducing the issue in [safe mode](https://www.home-assistant.io/blog/2023/11/01/release-202311/#restarting-into-safe-mode) to rule out problems with unsupported custom resources.
  - type: markdown
    attributes:
      value: |
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -1,51 +1,31 @@
 Build:
-  - changed-files:
-      - any-glob-to-any-file:
-          - build-scripts/**
-          - .browserslistrc
-          - gulpfile.js
+  - build-scripts/**
+  - .browserslistrc
+  - gulpfile.js

 Cast:
-  - changed-files:
-      - any-glob-to-any-file:
-          - cast/src/**
-          - src/cast/**
+  - cast/src/**
+  - src/cast/**

 Demo:
-  - changed-files:
-      - any-glob-to-any-file:
-          - demo/src/**
-          - src/fake_data/**
+  - demo/src/**
+  - src/fake_data/**

 Design:
-  - changed-files:
-      - any-glob-to-any-file:
-          - gallery/src/**
-          - src/fake_data/**
+  - gallery/src/**
+  - src/fake_data/**

 Dependencies:
-  - any:
-      - changed-files:
-          # Match when only these files are changed (i.e. don't match PRs that happen to add or remove packages)
-          - any-glob-to-all-files:
-              - package.json
-              - renovate.json
-              - yarn.lock
-              - .yarn/**
-              - .yarnrc.yml
-              - .nvmrc
-      # Dependabot and Renovate branches always match (i.e. compatibility tweaks by members considered minor)
-      - head-branch:
-          - "^renovate/"
-          - "^dependabot/"
+  - package.json
+  - renovate.json
+  - yarn.lock
+  - .yarn/**
+  - .yarnrc.yml
+  - .nvmrc

 GitHub Actions:
-  - changed-files:
-      - any-glob-to-any-file:
-          - .github/workflows/**
-          - .github/*.yml
+  - .github/workflows/**
+  - .github/*.yml

 Supervisor:
-  - changed-files:
-      - any-glob-to-any-file:
-          - hassio/src/**
+  - hassio/src/**
--- a/.github/workflows/cast_deployment.yaml
+++ b/.github/workflows/cast_deployment.yaml
@@ -21,12 +21,12 @@ jobs:
      url: ${{ steps.deploy.outputs.NETLIFY_LIVE_URL || steps.deploy.outputs.NETLIFY_URL }}
    steps:
      - name: Check out files from GitHub
-        uses: actions/checkout@v4.1.7
+        uses: actions/checkout@v4.1.1
        with:
          ref: dev

      - name: Setup Node
-        uses: actions/setup-node@v4.0.2
+        uses: actions/setup-node@v4.0.0
        with:
          node-version-file: ".nvmrc"
          cache: yarn
@@ -57,12 +57,12 @@ jobs:
      url: ${{ steps.deploy.outputs.NETLIFY_LIVE_URL || steps.deploy.outputs.NETLIFY_URL }}
    steps:
      - name: Check out files from GitHub
-        uses: actions/checkout@v4.1.7
+        uses: actions/checkout@v4.1.1
        with:
          ref: master

      - name: Setup Node
-        uses: actions/setup-node@v4.0.2
+        uses: actions/setup-node@v4.0.0
        with:
          node-version-file: ".nvmrc"
          cache: yarn
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -24,9 +24,9 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Check out files from GitHub
-        uses: actions/checkout@v4.1.7
+        uses: actions/checkout@v4.1.1
      - name: Setup Node
-        uses: actions/setup-node@v4.0.2
+        uses: actions/setup-node@v4.0.0
        with:
          node-version-file: ".nvmrc"
          cache: yarn
@@ -37,20 +37,17 @@ jobs:
      - name: Build resources
        run: ./node_modules/.bin/gulp gen-icons-json build-translations build-locale-data gather-gallery-pages
      - name: Setup lint cache
-        uses: actions/cache@v4.0.2
+        uses: actions/cache@v3.3.2
        with:
          path: |
            node_modules/.cache/prettier
            node_modules/.cache/eslint
-            node_modules/.cache/typescript
          key: lint-${{ github.sha }}
          restore-keys: lint-
      - name: Run eslint
        run: yarn run lint:eslint --quiet
      - name: Run tsc
        run: yarn run lint:types
-      - name: Run lit-analyzer
-        run: yarn run lint:lit --quiet
      - name: Run prettier
        run: yarn run lint:prettier
  test:
@@ -58,16 +55,16 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Check out files from GitHub
-        uses: actions/checkout@v4.1.7
+        uses: actions/checkout@v4.1.1
      - name: Setup Node
-        uses: actions/setup-node@v4.0.2
+        uses: actions/setup-node@v4.0.0
        with:
          node-version-file: ".nvmrc"
          cache: yarn
      - name: Install dependencies
        run: yarn install --immutable
      - name: Build resources
-        run: ./node_modules/.bin/gulp gen-icons-json build-translations build-locale-data
+        run: ./node_modules/.bin/gulp build-translations build-locale-data
      - name: Run Tests
        run: yarn run test
  build:
@@ -76,9 +73,9 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Check out files from GitHub
-        uses: actions/checkout@v4.1.7
+        uses: actions/checkout@v4.1.1
      - name: Setup Node
-        uses: actions/setup-node@v4.0.2
+        uses: actions/setup-node@v4.0.0
        with:
          node-version-file: ".nvmrc"
          cache: yarn
@@ -89,7 +86,7 @@ jobs:
        env:
          IS_TEST: "true"
      - name: Upload bundle stats
-        uses: actions/upload-artifact@v4.3.3
+        uses: actions/upload-artifact@v3.1.3
        with:
          name: frontend-bundle-stats
          path: build/stats/*.json
@@ -100,9 +97,9 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Check out files from GitHub
-        uses: actions/checkout@v4.1.7
+        uses: actions/checkout@v4.1.1
      - name: Setup Node
-        uses: actions/setup-node@v4.0.2
+        uses: actions/setup-node@v4.0.0
        with:
          node-version-file: ".nvmrc"
          cache: yarn
@@ -113,7 +110,7 @@ jobs:
        env:
          IS_TEST: "true"
      - name: Upload bundle stats
-        uses: actions/upload-artifact@v4.3.3
+        uses: actions/upload-artifact@v3.1.3
        with:
          name: supervisor-bundle-stats
          path: build/stats/*.json
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -23,7 +23,7 @@ jobs:

    steps:
      - name: Checkout repository
-        uses: actions/checkout@v4.1.7
+        uses: actions/checkout@v4.1.1
        with:
          # We must fetch at least the immediate parents so that if this is
          # a pull request then we can checkout the head.
@@ -36,14 +36,14 @@ jobs:

      # Initializes the CodeQL tools for scanning.
      - name: Initialize CodeQL
-        uses: github/codeql-action/init@v3
+        uses: github/codeql-action/init@v2
        with:
          languages: ${{ matrix.language }}

      # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
      # If this step fails, then you should remove it and run the build manually (see below)
      - name: Autobuild
-        uses: github/codeql-action/autobuild@v3
+        uses: github/codeql-action/autobuild@v2

      # ℹ️ Command-line programs to run using the OS shell.
      # 📚 https://git.io/JvXDl
@@ -57,4 +57,4 @@ jobs:
      #   make release

      - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v3
+        uses: github/codeql-action/analyze@v2
--- a/.github/workflows/demo_deployment.yaml
+++ b/.github/workflows/demo_deployment.yaml
@@ -22,12 +22,12 @@ jobs:
      url: ${{ steps.deploy.outputs.NETLIFY_LIVE_URL || steps.deploy.outputs.NETLIFY_URL }}
    steps:
      - name: Check out files from GitHub
-        uses: actions/checkout@v4.1.7
+        uses: actions/checkout@v4.1.1
        with:
          ref: dev

      - name: Setup Node
-        uses: actions/setup-node@v4.0.2
+        uses: actions/setup-node@v4.0.0
        with:
          node-version-file: ".nvmrc"
          cache: yarn
@@ -58,12 +58,12 @@ jobs:
      url: ${{ steps.deploy.outputs.NETLIFY_LIVE_URL || steps.deploy.outputs.NETLIFY_URL }}
    steps:
      - name: Check out files from GitHub
-        uses: actions/checkout@v4.1.7
+        uses: actions/checkout@v4.1.1
        with:
          ref: master

      - name: Setup Node
-        uses: actions/setup-node@v4.0.2
+        uses: actions/setup-node@v4.0.0
        with:
          node-version-file: ".nvmrc"
          cache: yarn
--- a/.github/workflows/design_deployment.yaml
+++ b/.github/workflows/design_deployment.yaml
@@ -16,10 +16,10 @@ jobs:
      url: ${{ steps.deploy.outputs.NETLIFY_LIVE_URL || steps.deploy.outputs.NETLIFY_URL }}
    steps:
      - name: Check out files from GitHub
-        uses: actions/checkout@v4.1.7
+        uses: actions/checkout@v4.1.1

      - name: Setup Node
-        uses: actions/setup-node@v4.0.2
+        uses: actions/setup-node@v4.0.0
        with:
          node-version-file: ".nvmrc"
          cache: yarn
--- a/.github/workflows/design_preview.yaml
+++ b/.github/workflows/design_preview.yaml
@@ -21,10 +21,10 @@ jobs:
    if: github.repository == 'home-assistant/frontend' && contains(github.event.pull_request.labels.*.name, 'needs design preview')
    steps:
      - name: Check out files from GitHub
-        uses: actions/checkout@v4.1.7
+        uses: actions/checkout@v4.1.1

      - name: Setup Node
-        uses: actions/setup-node@v4.0.2
+        uses: actions/setup-node@v4.0.0
        with:
          node-version-file: ".nvmrc"
          cache: yarn
--- a/.github/workflows/nightly.yaml
+++ b/.github/workflows/nightly.yaml
@@ -6,7 +6,7 @@ on:
    - cron: "0 1 * * *"

 env:
-  PYTHON_VERSION: "3.12"
+  PYTHON_VERSION: "3.11"
  NODE_OPTIONS: --max_old_space_size=6144

 permissions:
@@ -20,7 +20,7 @@ jobs:
      contents: write
    steps:
      - name: Checkout the repository
-        uses: actions/checkout@v4.1.7
+        uses: actions/checkout@v4.1.1

      - name: Set up Python ${{ env.PYTHON_VERSION }}
        uses: actions/setup-python@v5
@@ -28,7 +28,7 @@ jobs:
          python-version: ${{ env.PYTHON_VERSION }}

      - name: Setup Node
-        uses: actions/setup-node@v4.0.2
+        uses: actions/setup-node@v4.0.0
        with:
          node-version-file: ".nvmrc"
          cache: yarn
@@ -42,7 +42,7 @@ jobs:
          LOKALISE_TOKEN: ${{ secrets.LOKALISE_TOKEN }}

      - name: Bump version
-        run: script/version_bump.js nightly
+        run: script/version_bump.cjs nightly

      - name: Build nightly Python wheels
        run: |
@@ -57,14 +57,14 @@ jobs:
        run: tar -czvf translations.tar.gz translations

      - name: Upload build artifacts
-        uses: actions/upload-artifact@v4.3.3
+        uses: actions/upload-artifact@v3.1.3
        with:
          name: wheels
          path: dist/home_assistant_frontend*.whl
          if-no-files-found: error

      - name: Upload translations
-        uses: actions/upload-artifact@v4.3.3
+        uses: actions/upload-artifact@v3.1.3
        with:
          name: translations
          path: translations.tar.gz
--- a/.github/workflows/relative-ci.yaml
+++ b/.github/workflows/relative-ci.yaml
@@ -17,7 +17,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Send bundle stats and build information to RelativeCI
-        uses: relative-ci/agent-action@v2.1.11
+        uses: relative-ci/agent-action@v2.1.10
        with:
          key: ${{ secrets[format('RELATIVE_CI_KEY_{0}_{1}', matrix.bundle, matrix.build)] }}
          token: ${{ github.token }}
--- a/.github/workflows/release-drafter.yaml
+++ b/.github/workflows/release-drafter.yaml
@@ -18,6 +18,6 @@ jobs:
      pull-requests: read
    runs-on: ubuntu-latest
    steps:
-      - uses: release-drafter/release-drafter@v6.0.0
+      - uses: release-drafter/release-drafter@v5
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -6,7 +6,7 @@ on:
      - published

 env:
-  PYTHON_VERSION: "3.12"
+  PYTHON_VERSION: "3.11"
  NODE_OPTIONS: --max_old_space_size=6144

 # Set default workflow permissions
@@ -23,7 +23,7 @@ jobs:
      contents: write # Required to upload release assets
    steps:
      - name: Checkout the repository
-        uses: actions/checkout@v4.1.7
+        uses: actions/checkout@v4.1.1

      - name: Verify version
        uses: home-assistant/actions/helpers/verify-version@master
@@ -34,7 +34,7 @@ jobs:
          python-version: ${{ env.PYTHON_VERSION }}

      - name: Setup Node
-        uses: actions/setup-node@v4.0.2
+        uses: actions/setup-node@v4.0.0
        with:
          node-version-file: ".nvmrc"
          cache: yarn
@@ -55,7 +55,7 @@ jobs:
          script/release

      - name: Upload release assets
-        uses: softprops/action-gh-release@v2.0.6
+        uses: softprops/action-gh-release@v0.1.15
        with:
          files: |
            dist/*.whl
@@ -74,7 +74,7 @@ jobs:
          echo "home-assistant-frontend==$version" > ./requirements.txt

      - name: Build wheels
-        uses: home-assistant/wheels@2024.01.0
+        uses: home-assistant/wheels@2023.10.5
        with:
          abi: cp311
          tag: musllinux_1_2
--- a/.github/workflows/translations.yaml
+++ b/.github/workflows/translations.yaml
@@ -13,7 +13,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout the repository
-        uses: actions/checkout@v4.1.7
+        uses: actions/checkout@v4.1.1

      - name: Upload Translations
        run: |
--- a/.yarn/patches/hls.js-npm-1.5.7-f5bbd3d060.patch
+++ b/.yarn/patches/hls.js-npm-1.5.7-f5bbd3d060.patch
@@ -1,18 +0,0 @@
-diff --git a/dist/hls.light.mjs b/dist/hls.light.mjs
-index eed9d788fafdb159975e1a2eb08ac88ba9c9ac33..ace881935e6665946f1c8110ebd2f739cde4427e 100644
--- a/dist/hls.light.mjs
-+++ b/dist/hls.light.mjs
-@@ -20523,9 +20523,9 @@ class Hls {
- }
- Hls.defaultConfig = void 0;
- 
-var KeySystemFormats = empty.KeySystemFormats;
-var KeySystems = empty.KeySystems;
-var SubtitleStreamController = empty.SubtitleStreamController;
-var TimelineController = empty.TimelineController;
-+var KeySystemFormats = empty;
-+var KeySystems = empty;
-+var SubtitleStreamController = empty;
-+var TimelineController = empty;
- export { AbrController, AttrList, Cues as AudioStreamController, Cues as AudioTrackController, BasePlaylistController, BaseSegment, BaseStreamController, BufferController, Cues as CMCDController, CapLevelController, ChunkMetadata, ContentSteeringController, DateRange, Cues as EMEController, ErrorActionFlags, ErrorController, ErrorDetails, ErrorTypes, Events, FPSController, Fragment, Hls, HlsSkip, HlsUrlParameters, KeySystemFormats, KeySystems, Level, LevelDetails, LevelKey, LoadStats, MetadataSchema, NetworkErrorAction, Part, PlaylistLevelType, SubtitleStreamController, Cues as SubtitleTrackController, TimelineController, Hls as default, getMediaSource, isMSESupported, isSupported };
- //# sourceMappingURL=hls.light.mjs.map
--- a/.yarn/patches/sortablejs-npm-1.15.0-f3a393abcc.patch
+++ b/.yarn/patches/sortablejs-npm-1.15.0-f3a393abcc.patch
@@ -0,0 +1,39 @@
+diff --git a/modular/sortable.complete.esm.js b/modular/sortable.complete.esm.js
+index 02e9f2d6bebeb430fe6e7c1cc3f9c3c9df051f14..bb8268b0844a1faa4108cc92c0be2a3dbaf23f83 100644
+--- a/modular/sortable.complete.esm.js
+++ b/modular/sortable.complete.esm.js
+@@ -1657,7 +1657,7 @@ Sortable.prototype =
+           target = parent; // store last element
+         }
+         /* jshint boss:true */
+-        while (parent = parent.parentNode);
+        while (parent = parent.parentNode || parent.getRootNode().host);
+       }
+ 
+       _unhideGhostForTarget();
+diff --git a/modular/sortable.core.esm.js b/modular/sortable.core.esm.js
+index b04c8b4634f7c6b4ef1aadbb48afe6564306dea9..39a107163c8c336ebd669b5ea8a936af87e1c1e7 100644
+--- a/modular/sortable.core.esm.js
+++ b/modular/sortable.core.esm.js
+@@ -1657,7 +1657,7 @@ Sortable.prototype =
+           target = parent; // store last element
+         }
+         /* jshint boss:true */
+-        while (parent = parent.parentNode);
+        while (parent = parent.parentNode || parent.getRootNode().host);
+       }
+ 
+       _unhideGhostForTarget();
+diff --git a/modular/sortable.esm.js b/modular/sortable.esm.js
+index 6ec7ed1bb557e21c2578200161e989c65d23150b..0a05475a22904472fac6c13f524c674da76584b0 100644
+--- a/modular/sortable.esm.js
+++ b/modular/sortable.esm.js
+@@ -1657,7 +1657,7 @@ Sortable.prototype =
+           target = parent; // store last element
+         }
+         /* jshint boss:true */
+-        while (parent = parent.parentNode);
+        while (parent = parent.parentNode || parent.getRootNode().host);
+       }
+ 
+       _unhideGhostForTarget();
--- a/.yarn/patches/sortablejs-npm-1.15.2-73347ae85a.patch
+++ b/.yarn/patches/sortablejs-npm-1.15.2-73347ae85a.patch
@@ -1,73 +0,0 @@
-diff --git a/modular/sortable.core.esm.js b/modular/sortable.core.esm.js
-index 93ba17509e2e8583ab241fea6845fbe714c584a2..de0651ddb5dced30d36f7d764da0dd0b441f523f 100644
--- a/modular/sortable.core.esm.js
-+++ b/modular/sortable.core.esm.js
-@@ -1461,7 +1461,7 @@ Sortable.prototype = /** @lends Sortable.prototype */{
-           }
-           target = parent; // store last element
-         }
-        /* jshint boss:true */ while (parent = parent.parentNode);
-+        /* jshint boss:true */ while (parent = parent.parentNode || parent.getRootNode().host);
-       }
-       _unhideGhostForTarget();
-     }
-@@ -1781,11 +1781,16 @@ Sortable.prototype = /** @lends Sortable.prototype */{
-         }
-         if (_onMove(rootEl, el, dragEl, dragRect, target, targetRect, evt, !!target) !== false) {
-           capture();
-          if (elLastChild && elLastChild.nextSibling) {
-            // the last draggable element is not the last node
-            el.insertBefore(dragEl, elLastChild.nextSibling);
-          } else {
-            el.appendChild(dragEl);
-+          try {
-+            if (elLastChild && elLastChild.nextSibling) {
-+              // the last draggable element is not the last node
-+              el.insertBefore(dragEl, elLastChild.nextSibling);
-+            } else {
-+              el.appendChild(dragEl);
-+            }
-+          }
-+          catch(err) {
-+            return completed(false);
-           }
-           parentEl = el; // actualization
- 
-@@ -1802,7 +1807,13 @@ Sortable.prototype = /** @lends Sortable.prototype */{
-         targetRect = getRect(target);
-         if (_onMove(rootEl, el, dragEl, dragRect, target, targetRect, evt, false) !== false) {
-           capture();
-          el.insertBefore(dragEl, firstChild);
-+          try {
-+            el.insertBefore(dragEl, firstChild);
-+          }
-+          catch(err) {
-+            return completed(false);
-+          }
-+          
-           parentEl = el; // actualization
- 
-           changed();
-@@ -1849,12 +1860,17 @@ Sortable.prototype = /** @lends Sortable.prototype */{
-           _silent = true;
-           setTimeout(_unsilent, 30);
-           capture();
-          if (after && !nextSibling) {
-            el.appendChild(dragEl);
-          } else {
-            target.parentNode.insertBefore(dragEl, after ? nextSibling : target);
-          }
- 
-+          try {
-+            if (after && !nextSibling) {
-+              el.appendChild(dragEl);
-+            } else {
-+              target.parentNode.insertBefore(dragEl, after ? nextSibling : target);
-+            }
-+          }
-+          catch(err) {
-+            return completed(false);
-+          }
-           // Undo chrome's scroll adjustment (has no effect on other browsers)
-           if (scrolledPastTop) {
-             scrollBy(scrolledPastTop, 0, scrollBefore - scrolledPastTop.scrollTop);
--- a/.yarn/releases/yarn-4.0.2.cjs
+++ b/.yarn/releases/yarn-4.0.2.cjs
--- a/.yarn/releases/yarn-4.3.1.cjs
+++ b/.yarn/releases/yarn-4.3.1.cjs
--- a/.yarnrc.yml
+++ b/.yarnrc.yml
@@ -6,4 +6,4 @@ enableGlobalCache: false

 nodeLinker: node-modules

-yarnPath: .yarn/releases/yarn-4.3.1.cjs
+yarnPath: .yarn/releases/yarn-4.0.2.cjs
--- a/build-scripts/babel-plugins/custom-polyfill-plugin.js
+++ b/build-scripts/babel-plugins/custom-polyfill-plugin.js
@@ -1,56 +1,7 @@
 import defineProvider from "@babel/helper-define-polyfill-provider";
-import { join } from "node:path";
-import paths from "../paths.cjs";
-
-const POLYFILL_DIR = join(paths.polymer_dir, "src/resources/polyfills");

 // List of polyfill keys with supported browser targets for the functionality
 const PolyfillSupport = {
-  // Note states and shadowRoot properties should be supported.
-  "element-internals": {
-    android: 90,
-    chrome: 90,
-    edge: 90,
-    firefox: 126,
-    ios: 17.4,
-    opera: 76,
-    opera_mobile: 64,
-    safari: 17.4,
-    samsung: 15.0,
-  },
-  "element-append": {
-    android: 54,
-    chrome: 54,
-    edge: 17,
-    firefox: 49,
-    ios: 10.0,
-    opera: 41,
-    opera_mobile: 41,
-    safari: 10.0,
-    samsung: 6.0,
-  },
-  "element-getattributenames": {
-    android: 61,
-    chrome: 61,
-    edge: 18,
-    firefox: 45,
-    ios: 10.3,
-    opera: 48,
-    opera_mobile: 45,
-    safari: 10.1,
-    samsung: 8.0,
-  },
-  "element-toggleattribute": {
-    android: 69,
-    chrome: 69,
-    edge: 18,
-    firefox: 63,
-    ios: 12.0,
-    opera: 56,
-    opera_mobile: 48,
-    safari: 12.0,
-    samsung: 10.0,
-  },
  fetch: {
    android: 42,
    chrome: 42,
@@ -62,31 +13,6 @@ const PolyfillSupport = {
    safari: 10.1,
    samsung: 4.0,
  },
-  "intl-getcanonicallocales": {
-    android: 54,
-    chrome: 54,
-    edge: 16,
-    firefox: 48,
-    ios: 10.3,
-    opera: 41,
-    opera_mobile: 41,
-    safari: 10.1,
-    samsung: 6.0,
-  },
-  "intl-locale": {
-    android: 74,
-    chrome: 74,
-    edge: 79,
-    firefox: 75,
-    ios: 14.0,
-    opera: 62,
-    opera_mobile: 53,
-    safari: 14.0,
-    samsung: 11.0,
-  },
-  "intl-other": {
-    // Not specified (i.e. always try polyfill) since compatibility depends on supported locales
-  },
  proxy: {
    android: 49,
    chrome: 49,
@@ -98,67 +24,17 @@ const PolyfillSupport = {
    safari: 10.0,
    samsung: 5.0,
  },
-  "resize-observer": {
-    android: 64,
-    chrome: 64,
-    edge: 79,
-    firefox: 69,
-    ios: 13.4,
-    opera: 51,
-    opera_mobile: 47,
-    safari: 13.1,
-    samsung: 9.0,
-  },
 };

 // Map of global variables and/or instance and static properties to the
 // corresponding polyfill key and actual module to import
 const polyfillMap = {
  global: {
-    fetch: { key: "fetch", module: "unfetch/polyfill" },
    Proxy: { key: "proxy", module: "proxy-polyfill" },
-    ResizeObserver: {
-      key: "resize-observer",
-      module: join(POLYFILL_DIR, "resize-observer.ts"),
-    },
-  },
-  instance: {
-    attachInternals: {
-      key: "element-internals",
-      module: "element-internals-polyfill",
-    },
-    ...Object.fromEntries(
-      ["append", "getAttributeNames", "toggleAttribute"].map((prop) => {
-        const key = `element-${prop.toLowerCase()}`;
-        return [prop, { key, module: join(POLYFILL_DIR, `${key}.ts`) }];
-      })
-    ),
-  },
-  static: {
-    Intl: {
-      getCanonicalLocales: {
-        key: "intl-getcanonicallocales",
-        module: join(POLYFILL_DIR, "intl-polyfill.ts"),
-      },
-      Locale: {
-        key: "intl-locale",
-        module: join(POLYFILL_DIR, "intl-polyfill.ts"),
-      },
-      ...Object.fromEntries(
-        [
-          "DateTimeFormat",
-          "DisplayNames",
-          "ListFormat",
-          "NumberFormat",
-          "PluralRules",
-          "RelativeTimeFormat",
-        ].map((obj) => [
-          obj,
-          { key: "intl-other", module: join(POLYFILL_DIR, "intl-polyfill.ts") },
-        ])
-      ),
-    },
+    fetch: { key: "fetch", module: "unfetch/polyfill" },
  },
+  instance: {},
+  static: {},
 };

 // Create plugin using the same factory as for CoreJS
@@ -166,16 +42,14 @@ export default defineProvider(
  ({ createMetaResolver, debug, shouldInjectPolyfill }) => {
    const resolvePolyfill = createMetaResolver(polyfillMap);
    return {
-      name: "custom-polyfill",
+      name: "HA Custom",
      polyfills: PolyfillSupport,
      usageGlobal(meta, utils) {
        const polyfill = resolvePolyfill(meta);
        if (polyfill && shouldInjectPolyfill(polyfill.desc.key)) {
          debug(polyfill.desc.key);
          utils.injectGlobalImport(polyfill.desc.module);
-          return true;
        }
-        return false;
      },
    };
  }
--- a/build-scripts/bundle.cjs
+++ b/build-scripts/bundle.cjs
@@ -1,9 +1,6 @@
 const path = require("path");
 const env = require("./env.cjs");
 const paths = require("./paths.cjs");
-const { dependencies } = require("../package.json");
-
-const BABEL_PLUGINS = path.join(__dirname, "babel-plugins");

 // GitHub base URL to use for production source maps
 // Nightly builds use the commit SHA, otherwise assumes there is a tag that matches the version
@@ -92,8 +89,8 @@ module.exports.babelOptions = ({ latestBuild, isProdBuild, isTestBuild }) => ({
    [
      "@babel/preset-env",
      {
-        useBuiltIns: "usage",
-        corejs: dependencies["core-js"],
+        useBuiltIns: latestBuild ? false : "usage",
+        corejs: latestBuild ? false : "3.33",
        bugfixes: true,
        shippedProposals: true,
      },
@@ -102,12 +99,22 @@ module.exports.babelOptions = ({ latestBuild, isProdBuild, isTestBuild }) => ({
  ],
  plugins: [
    [
-      path.join(BABEL_PLUGINS, "inline-constants-plugin.cjs"),
+      path.resolve(
+        paths.polymer_dir,
+        "build-scripts/babel-plugins/inline-constants-plugin.cjs"
+      ),
      {
        modules: ["@mdi/js"],
        ignoreModuleNotFound: true,
      },
    ],
+    [
+      path.resolve(
+        paths.polymer_dir,
+        "build-scripts/babel-plugins/custom-polyfill-plugin.js"
+      ),
+      { method: "usage-global" },
+    ],
    // Minify template literals for production
    isProdBuild && [
      "template-html-minifier",
@@ -133,7 +140,7 @@ module.exports.babelOptions = ({ latestBuild, isProdBuild, isTestBuild }) => ({
    // Import helpers and regenerator from runtime package
    [
      "@babel/plugin-transform-runtime",
-      { version: dependencies["@babel/runtime"] },
+      { version: require("../package.json").dependencies["@babel/runtime"] },
    ],
    // Support  some proposals still in TC39 process
    ["@babel/plugin-proposal-decorators", { decoratorsBeforeExport: true }],
@@ -145,27 +152,6 @@ module.exports.babelOptions = ({ latestBuild, isProdBuild, isTestBuild }) => ({
  ],
  sourceMaps: !isTestBuild,
  overrides: [
-    {
-      // Add plugin to inject various polyfills, excluding the polyfills
-      // themselves to prevent self-injection.
-      plugins: [
-        [
-          path.join(BABEL_PLUGINS, "custom-polyfill-plugin.js"),
-          { method: "usage-global" },
-        ],
-      ],
-      exclude: [
-        path.join(paths.polymer_dir, "src/resources/polyfills"),
-        ...[
-          "@formatjs/(?:ecma402-abstract|intl-\\w+)",
-          "@lit-labs/virtualizer/polyfills",
-          "@webcomponents/scoped-custom-element-registry",
-          "element-internals-polyfill",
-          "proxy-polyfill",
-          "unfetch",
-        ].map((p) => new RegExp(`/node_modules/${p}/`)),
-      ],
-    },
    {
      // Use unambiguous for dependencies so that require() is correctly injected into CommonJS files
      // Exclusions are needed in some cases where ES modules have no static imports or exports, such as polyfills
--- a/build-scripts/gulp/compress.js
+++ b/build-scripts/gulp/compress.js
@@ -8,10 +8,7 @@ const zopfliOptions = { threshold: 150 };

 const compressDist = (rootDir) =>
  gulp
-    .src([
-      `${rootDir}/**/*.{js,json,css,svg,xml}`,
-      `${rootDir}/{authorize,onboarding}.html`,
-    ])
+    .src([`${rootDir}/**/*.{js,json,css,svg}`])
    .pipe(zopfli(zopfliOptions))
    .pipe(gulp.dest(rootDir));

--- a/build-scripts/gulp/fetch-nightly-translations.js
+++ b/build-scripts/gulp/fetch-nightly-translations.js
@@ -9,7 +9,7 @@ import gulp from "gulp";
 import jszip from "jszip";
 import path from "path";
 import process from "process";
-import { extract } from "tar";
+import tar from "tar";

 const MAX_AGE = 24; // hours
 const OWNER = "home-assistant";
@@ -156,7 +156,7 @@ gulp.task("fetch-nightly-translations", async function () {
  console.log("Unpacking downloaded translations...");
  const zip = await jszip.loadAsync(downloadResponse.data);
  await deleteCurrent;
-  const extractStream = zip.file(/.*/)[0].nodeStream().pipe(extract());
+  const extractStream = zip.file(/.*/)[0].nodeStream().pipe(tar.extract());
  await new Promise((resolve, reject) => {
    extractStream.on("close", resolve).on("error", reject);
  });
--- a/build-scripts/gulp/translations.js
+++ b/build-scripts/gulp/translations.js
@@ -1,112 +1,92 @@
-/* eslint-disable max-classes-per-file */
-
-import { deleteAsync } from "del";
-import { glob } from "glob";
+import { createHash } from "crypto";
+import { deleteSync } from "del";
+import { mkdirSync, readdirSync, readFileSync, renameSync } from "fs";
+import { writeFile } from "node:fs/promises";
 import gulp from "gulp";
+import flatmap from "gulp-flatmap";
+import transform from "gulp-json-transform";
+import merge from "gulp-merge-json";
 import rename from "gulp-rename";
-import merge from "lodash.merge";
-import { createHash } from "node:crypto";
-import { mkdir, readFile } from "node:fs/promises";
-import { basename, join } from "node:path";
-import { PassThrough, Transform } from "node:stream";
-import { finished } from "node:stream/promises";
+import path from "path";
+import vinylBuffer from "vinyl-buffer";
+import source from "vinyl-source-stream";
 import env from "../env.cjs";
 import paths from "../paths.cjs";
+import { mapFiles } from "../util.cjs";
 import "./fetch-nightly-translations.js";

 const inFrontendDir = "translations/frontend";
 const inBackendDir = "translations/backend";
 const workDir = "build/translations";
-const outDir = join(workDir, "output");
-const EN_SRC = join(paths.translations_src, "en.json");
-const TEST_LOCALE = "en-x-test";
-
+const fullDir = workDir + "/full";
+const coreDir = workDir + "/core";
+const outDir = workDir + "/output";
 let mergeBackend = false;

 gulp.task(
  "translations-enable-merge-backend",
-  gulp.parallel(async () => {
+  gulp.parallel((done) => {
    mergeBackend = true;
+    done();
  }, "allow-setup-fetch-nightly-translations")
 );

-// Transform stream to apply a function on Vinyl JSON files (buffer mode only).
-// The provided function can either return a new object, or an array of
-// [object, subdirectory] pairs for fragmentizing the JSON.
-class CustomJSON extends Transform {
-  constructor(func, reviver = null) {
-    super({ objectMode: true });
-    this._func = func;
-    this._reviver = reviver;
-  }
+// Panel translations which should be split from the core translations.
+const TRANSLATION_FRAGMENTS = Object.keys(
+  JSON.parse(
+    readFileSync(
+      path.resolve(paths.polymer_dir, "src/translations/en.json"),
+      "utf-8"
+    )
+  ).ui.panel
+);

-  async _transform(file, _, callback) {
-    try {
-      let obj = JSON.parse(file.contents.toString(), this._reviver);
-      if (this._func) obj = this._func(obj, file.path);
-      for (const [outObj, dir] of Array.isArray(obj) ? obj : [[obj, ""]]) {
-        const outFile = file.clone({ contents: false });
-        outFile.contents = Buffer.from(JSON.stringify(outObj));
-        outFile.dirname += `/${dir}`;
-        this.push(outFile);
-      }
-      callback(null);
-    } catch (err) {
-      callback(err);
-    }
-  }
-}
-
-// Transform stream to merge Vinyl JSON files (buffer mode only).
-class MergeJSON extends Transform {
-  _objects = [];
-
-  constructor(stem, startObj = {}, reviver = null) {
-    super({ objectMode: true, allowHalfOpen: false });
-    this._stem = stem;
-    this._startObj = structuredClone(startObj);
-    this._reviver = reviver;
-  }
-
-  async _transform(file, _, callback) {
-    try {
-      this._objects.push(JSON.parse(file.contents.toString(), this._reviver));
-      if (!this._outFile) this._outFile = file.clone({ contents: false });
-      callback(null);
-    } catch (err) {
-      callback(err);
-    }
-  }
-
-  async _flush(callback) {
-    try {
-      const mergedObj = merge(this._startObj, ...this._objects);
-      this._outFile.contents = Buffer.from(JSON.stringify(mergedObj));
-      this._outFile.stem = this._stem;
-      callback(null, this._outFile);
-    } catch (err) {
-      callback(err);
-    }
-  }
-}
-
-// Utility to flatten object keys to single level using separator
-const flatten = (data, prefix = "", sep = ".") => {
-  const output = {};
-  for (const [key, value] of Object.entries(data)) {
-    if (typeof value === "object") {
-      Object.assign(output, flatten(value, prefix + key + sep, sep));
+function recursiveFlatten(prefix, data) {
+  let output = {};
+  Object.keys(data).forEach((key) => {
+    if (typeof data[key] === "object") {
+      output = {
+        ...output,
+        ...recursiveFlatten(prefix + key + ".", data[key]),
+      };
    } else {
-      output[prefix + key] = value;
+      output[prefix + key] = data[key];
    }
-  }
+  });
  return output;
-};
+}

-// Filter functions that can be passed directly to JSON.parse()
-const emptyReviver = (_key, value) => value || undefined;
-const testReviver = (_key, value) =>
-  value && typeof value === "string" ? "TRANSLATED" : value;
+function flatten(data) {
+  return recursiveFlatten("", data);
+}
+
+function emptyFilter(data) {
+  const newData = {};
+  Object.keys(data).forEach((key) => {
+    if (data[key]) {
+      if (typeof data[key] === "object") {
+        newData[key] = emptyFilter(data[key]);
+      } else {
+        newData[key] = data[key];
+      }
+    }
+  });
+  return newData;
+}
+
+function recursiveEmpty(data) {
+  const newData = {};
+  Object.keys(data).forEach((key) => {
+    if (data[key]) {
+      if (typeof data[key] === "object") {
+        newData[key] = recursiveEmpty(data[key]);
+      } else {
+        newData[key] = "TRANSLATED";
+      }
+    }
+  });
+  return newData;
+}

 /**
 * Replace Lokalise key placeholders with their actual values.
@@ -115,44 +95,60 @@ const testReviver = (_key, value) =>
 * be included in src/translations/en.json, but still be usable while
 * developing locally.
 *
- * @link https://docs.lokalise.com/en/articles/1400528-key-referencing
+ * @link https://docs.lokalise.co/article/KO5SZWLLsy-key-referencing
 */
-const KEY_REFERENCE = /\[%key:([^%]+)%\]/;
-const lokaliseTransform = (data, path, original = data) => {
+const re_key_reference = /\[%key:([^%]+)%\]/;
+function lokaliseTransform(data, original, file) {
  const output = {};
-  for (const [key, value] of Object.entries(data)) {
-    if (typeof value === "object") {
-      output[key] = lokaliseTransform(value, path, original);
+  Object.entries(data).forEach(([key, value]) => {
+    if (value instanceof Object) {
+      output[key] = lokaliseTransform(value, original, file);
    } else {
-      output[key] = value.replace(KEY_REFERENCE, (_match, lokalise_key) => {
+      output[key] = value.replace(re_key_reference, (_match, lokalise_key) => {
        const replace = lokalise_key.split("::").reduce((tr, k) => {
          if (!tr) {
-            throw Error(`Invalid key placeholder ${lokalise_key} in ${path}`);
+            throw Error(
+              `Invalid key placeholder ${lokalise_key} in ${file.path}`
+            );
          }
          return tr[k];
        }, original);
        if (typeof replace !== "string") {
-          throw Error(`Invalid key placeholder ${lokalise_key} in ${path}`);
+          throw Error(
+            `Invalid key placeholder ${lokalise_key} in ${file.path}`
+          );
        }
        return replace;
      });
    }
-  }
+  });
  return output;
-};
+}

-gulp.task("clean-translations", () => deleteAsync([workDir]));
+gulp.task("clean-translations", async () => deleteSync([workDir]));

-const makeWorkDir = () => mkdir(workDir, { recursive: true });
+gulp.task("ensure-translations-build-dir", async () => {
+  mkdirSync(workDir, { recursive: true });
+});

-const createTestTranslation = () =>
+gulp.task("create-test-metadata", () =>
+  env.isProdBuild()
+    ? Promise.resolve()
+    : writeFile(
+        workDir + "/testMetadata.json",
+        JSON.stringify({ test: { nativeName: "Test" } })
+      )
+);
+
+gulp.task("create-test-translation", () =>
  env.isProdBuild()
    ? Promise.resolve()
    : gulp
-        .src(EN_SRC)
-        .pipe(new CustomJSON(null, testReviver))
-        .pipe(rename(`${TEST_LOCALE}.json`))
-        .pipe(gulp.dest(workDir));
+        .src(path.join(paths.translations_src, "en.json"))
+        .pipe(transform((data, _file) => recursiveEmpty(data)))
+        .pipe(rename("test.json"))
+        .pipe(gulp.dest(workDir))
+);

 /**
 * This task will build a master translation file, to be used as the base for
@@ -163,164 +159,278 @@ const createTestTranslation = () =>
 * project is buildable immediately after merging new translation keys, since
 * the Lokalise update to translations/en.json will not happen immediately.
 */
-const createMasterTranslation = () =>
-  gulp
-    .src([EN_SRC, ...(mergeBackend ? [`${inBackendDir}/en.json`] : [])])
-    .pipe(new CustomJSON(lokaliseTransform))
-    .pipe(new MergeJSON("en"))
-    .pipe(gulp.dest(workDir));
+gulp.task("build-master-translation", () => {
+  const src = [path.join(paths.translations_src, "en.json")];

-const FRAGMENTS = ["base"];
-
-const toggleSupervisorFragment = async () => {
-  FRAGMENTS[0] = "supervisor";
-};
-
-const panelFragment = (fragment) =>
-  fragment !== "base" && fragment !== "supervisor";
-
-const HASHES = new Map();
-
-const createTranslations = async () => {
-  // Parse and store the master to avoid repeating this for each locale, then
-  // add the panel fragments when processing the app.
-  const enMaster = JSON.parse(await readFile(`${workDir}/en.json`, "utf-8"));
-  if (FRAGMENTS[0] === "base") {
-    FRAGMENTS.push(...Object.keys(enMaster.ui.panel));
+  if (mergeBackend) {
+    src.push(path.join(inBackendDir, "en.json"));
  }

-  // The downstream pipeline is setup first.  It hashes the merged data for
-  // each locale, then fragmentizes and flattens the data for final output.
-  const translationFiles = await glob([
-    `${inFrontendDir}/!(en).json`,
-    ...(env.isProdBuild() ? [] : [`${workDir}/${TEST_LOCALE}.json`]),
-  ]);
-  const hashStream = new Transform({
-    objectMode: true,
-    transform: async (file, _, callback) => {
-      const hash = env.isProdBuild()
-        ? createHash("md5").update(file.contents).digest("hex")
-        : "dev";
-      HASHES.set(file.stem, hash);
-      file.stem += `-${hash}`;
-      callback(null, file);
-    },
-  }).setMaxListeners(translationFiles.length + 1);
-  const fragmentsStream = hashStream
+  return gulp
+    .src(src)
+    .pipe(transform((data, file) => lokaliseTransform(data, data, file)))
    .pipe(
-      new CustomJSON((data) =>
-        FRAGMENTS.map((fragment) => {
-          switch (fragment) {
-            case "base":
-              // Remove the panels and supervisor to create the base translations
-              return [
-                flatten({
-                  ...data,
-                  ui: { ...data.ui, panel: undefined },
-                  supervisor: undefined,
-                }),
-                "",
-              ];
-            case "supervisor":
-              // Supervisor key is at the top level
-              return [flatten(data.supervisor), ""];
-            default:
-              // Create a fragment with only the given panel
-              return [
-                flatten(data.ui.panel[fragment], `ui.panel.${fragment}.`),
-                fragment,
-              ];
-          }
-        })
-      )
-    )
-    .pipe(gulp.dest(outDir));
-
-  // Send the English master downstream first, then for each other locale
-  // generate merged JSON data to continue piping. It begins with the master
-  // translation as a failsafe for untranslated strings, and merges all parent
-  // tags into one file for each specific subtag
-  //
-  // TODO: This is a naive interpretation of BCP47 that should be improved.
-  //       Will be OK for now as long as we don't have anything more complicated
-  // than a base translation + region.
-  gulp
-    .src(`${workDir}/en.json`)
-    .pipe(new PassThrough({ objectMode: true }))
-    .pipe(hashStream, { end: false });
-  const mergesFinished = [];
-  for (const translationFile of translationFiles) {
-    const locale = basename(translationFile, ".json");
-    const subtags = locale.split("-");
-    const mergeFiles = [];
-    for (let i = 1; i <= subtags.length; i++) {
-      const lang = subtags.slice(0, i).join("-");
-      if (lang === TEST_LOCALE) {
-        mergeFiles.push(`${workDir}/${TEST_LOCALE}.json`);
-      } else if (lang !== "en") {
-        mergeFiles.push(`${inFrontendDir}/${lang}.json`);
-        if (mergeBackend) {
-          mergeFiles.push(`${inBackendDir}/${lang}.json`);
-        }
-      }
-    }
-    const mergeStream = gulp
-      .src(mergeFiles, { allowEmpty: true })
-      .pipe(new MergeJSON(locale, enMaster, emptyReviver));
-    mergesFinished.push(finished(mergeStream));
-    mergeStream.pipe(hashStream, { end: false });
-  }
-
-  // Wait for all merges to finish, then it's safe to end writing to the
-  // downstream pipeline and wait for all fragments to finish writing.
-  await Promise.all(mergesFinished);
-  hashStream.end();
-  await finished(fragmentsStream);
-};
-
-const writeTranslationMetaData = () =>
-  gulp
-    .src([`${paths.translations_src}/translationMetadata.json`])
-    .pipe(
-      new CustomJSON((meta) => {
-        // Add the test translation in development.
-        if (!env.isProdBuild()) {
-          meta[TEST_LOCALE] = { nativeName: "Translation Test" };
-        }
-        // Filter out locales without a native name, and add the hashes.
-        for (const locale of Object.keys(meta)) {
-          if (!meta[locale].nativeName) {
-            meta[locale] = undefined;
-            console.warn(
-              `Skipping locale ${locale} because native name is not translated.`
-            );
-          } else {
-            meta[locale].hash = HASHES.get(locale);
-          }
-        }
-        return {
-          fragments: FRAGMENTS.filter(panelFragment),
-          translations: meta,
-        };
+      merge({
+        fileName: "en.json",
      })
    )
-    .pipe(gulp.dest(workDir));
+    .pipe(gulp.dest(fullDir));
+});
+
+gulp.task("build-merged-translations", () =>
+  gulp
+    .src([
+      inFrontendDir + "/*.json",
+      "!" + inFrontendDir + "/en.json",
+      ...(env.isProdBuild() ? [] : [workDir + "/test.json"]),
+    ])
+    .pipe(transform((data, file) => lokaliseTransform(data, data, file)))
+    .pipe(
+      flatmap((stream, file) => {
+        // For each language generate a merged json file. It begins with the master
+        // translation as a failsafe for untranslated strings, and merges all parent
+        // tags into one file for each specific subtag
+        //
+        // TODO: This is a naive interpretation of BCP47 that should be improved.
+        //       Will be OK for now as long as we don't have anything more complicated
+        //       than a base translation + region.
+        const tr = path.basename(file.history[0], ".json");
+        const subtags = tr.split("-");
+        const src = [fullDir + "/en.json"];
+        for (let i = 1; i <= subtags.length; i++) {
+          const lang = subtags.slice(0, i).join("-");
+          if (lang === "test") {
+            src.push(workDir + "/test.json");
+          } else if (lang !== "en") {
+            src.push(inFrontendDir + "/" + lang + ".json");
+            if (mergeBackend) {
+              src.push(inBackendDir + "/" + lang + ".json");
+            }
+          }
+        }
+        return gulp
+          .src(src, { allowEmpty: true })
+          .pipe(transform((data) => emptyFilter(data)))
+          .pipe(
+            merge({
+              fileName: tr + ".json",
+            })
+          )
+          .pipe(gulp.dest(fullDir));
+      })
+    )
+);
+
+let taskName;
+
+const splitTasks = [];
+TRANSLATION_FRAGMENTS.forEach((fragment) => {
+  taskName = "build-translation-fragment-" + fragment;
+  gulp.task(taskName, () =>
+    // Return only the translations for this fragment.
+    gulp
+      .src(fullDir + "/*.json")
+      .pipe(
+        transform((data) => ({
+          ui: {
+            panel: {
+              [fragment]: data.ui.panel[fragment],
+            },
+          },
+        }))
+      )
+      .pipe(gulp.dest(workDir + "/" + fragment))
+  );
+  splitTasks.push(taskName);
+});
+
+taskName = "build-translation-core";
+gulp.task(taskName, () =>
+  // Remove the fragment translations from the core translation.
+  gulp
+    .src(fullDir + "/*.json")
+    .pipe(
+      transform((data, _file) => {
+        TRANSLATION_FRAGMENTS.forEach((fragment) => {
+          delete data.ui.panel[fragment];
+        });
+        delete data.supervisor;
+        return data;
+      })
+    )
+    .pipe(gulp.dest(coreDir))
+);
+
+splitTasks.push(taskName);
+
+gulp.task("build-flattened-translations", () =>
+  // Flatten the split versions of our translations, and move them into outDir
+  gulp
+    .src(
+      TRANSLATION_FRAGMENTS.map(
+        (fragment) => workDir + "/" + fragment + "/*.json"
+      ).concat(coreDir + "/*.json"),
+      { base: workDir }
+    )
+    .pipe(
+      transform((data) =>
+        // Polymer.AppLocalizeBehavior requires flattened json
+        flatten(data)
+      )
+    )
+    .pipe(
+      rename((filePath) => {
+        if (filePath.dirname === "core") {
+          filePath.dirname = "";
+        }
+        // In dev we create the file with the fake hash in the filename
+        if (!env.isProdBuild()) {
+          filePath.basename += "-dev";
+        }
+      })
+    )
+    .pipe(gulp.dest(outDir))
+);
+
+const fingerprints = {};
+
+gulp.task("build-translation-fingerprints", () => {
+  // Fingerprint full file of each language
+  const files = readdirSync(fullDir);
+
+  for (let i = 0; i < files.length; i++) {
+    fingerprints[files[i].split(".")[0]] = {
+      // In dev we create fake hashes
+      hash: env.isProdBuild()
+        ? createHash("md5")
+            .update(readFileSync(path.join(fullDir, files[i]), "utf-8"))
+            .digest("hex")
+        : "dev",
+    };
+  }
+
+  // In dev we create the file with the fake hash in the filename
+  if (env.isProdBuild()) {
+    mapFiles(outDir, ".json", (filename) => {
+      const parsed = path.parse(filename);
+
+      // nl.json -> nl-<hash>.json
+      if (!(parsed.name in fingerprints)) {
+        throw new Error(`Unable to find hash for ${filename}`);
+      }
+
+      renameSync(
+        filename,
+        `${parsed.dir}/${parsed.name}-${fingerprints[parsed.name].hash}${
+          parsed.ext
+        }`
+      );
+    });
+  }
+
+  const stream = source("translationFingerprints.json");
+  stream.write(JSON.stringify(fingerprints));
+  process.nextTick(() => stream.end());
+  return stream.pipe(vinylBuffer()).pipe(gulp.dest(workDir));
+});
+
+gulp.task("build-translation-fragment-supervisor", () =>
+  gulp
+    .src(fullDir + "/*.json")
+    .pipe(transform((data) => data.supervisor))
+    .pipe(
+      rename((filePath) => {
+        // In dev we create the file with the fake hash in the filename
+        if (!env.isProdBuild()) {
+          filePath.basename += "-dev";
+        }
+      })
+    )
+    .pipe(gulp.dest(workDir + "/supervisor"))
+);
+
+gulp.task("build-translation-flatten-supervisor", () =>
+  gulp
+    .src(workDir + "/supervisor/*.json")
+    .pipe(
+      transform((data) =>
+        // Polymer.AppLocalizeBehavior requires flattened json
+        flatten(data)
+      )
+    )
+    .pipe(gulp.dest(outDir))
+);
+
+gulp.task("build-translation-write-metadata", () =>
+  gulp
+    .src([
+      path.join(paths.translations_src, "translationMetadata.json"),
+      ...(env.isProdBuild() ? [] : [workDir + "/testMetadata.json"]),
+      workDir + "/translationFingerprints.json",
+    ])
+    .pipe(merge({}))
+    .pipe(
+      transform((data) => {
+        const newData = {};
+        Object.entries(data).forEach(([key, value]) => {
+          // Filter out translations without native name.
+          if (value.nativeName) {
+            newData[key] = value;
+          } else {
+            console.warn(
+              `Skipping language ${key}. Native name was not translated.`
+            );
+          }
+        });
+        return newData;
+      })
+    )
+    .pipe(
+      transform((data) => ({
+        fragments: TRANSLATION_FRAGMENTS,
+        translations: data,
+      }))
+    )
+    .pipe(rename("translationMetadata.json"))
+    .pipe(gulp.dest(workDir))
+);
+
+gulp.task(
+  "create-translations",
+  gulp.series(
+    gulp.parallel("create-test-metadata", "create-test-translation"),
+    "build-master-translation",
+    "build-merged-translations",
+    gulp.parallel(...splitTasks),
+    "build-flattened-translations"
+  )
+);

 gulp.task(
  "build-translations",
  gulp.series(
    gulp.parallel(
      "fetch-nightly-translations",
-      gulp.series("clean-translations", makeWorkDir)
+      gulp.series("clean-translations", "ensure-translations-build-dir")
    ),
-    createTestTranslation,
-    createMasterTranslation,
-    createTranslations,
-    writeTranslationMetaData
+    "create-translations",
+    "build-translation-fingerprints",
+    "build-translation-write-metadata"
  )
 );

 gulp.task(
  "build-supervisor-translations",
-  gulp.series(toggleSupervisorFragment, "build-translations")
+  gulp.series(
+    gulp.parallel(
+      "fetch-nightly-translations",
+      gulp.series("clean-translations", "ensure-translations-build-dir")
+    ),
+    "build-master-translation",
+    "build-merged-translations",
+    "build-translation-fragment-supervisor",
+    "build-translation-flatten-supervisor",
+    "build-translation-fingerprints",
+    "build-translation-write-metadata"
+  )
 );
--- a/build-scripts/gulp/webpack.js
+++ b/build-scripts/gulp/webpack.js
@@ -99,7 +99,7 @@ gulp.task("webpack-watch-app", () => {
  ).watch({ poll: isWsl }, doneHandler());
  gulp.watch(
    path.join(paths.translations_src, "en.json"),
-    gulp.series("build-translations", "copy-translations-app")
+    gulp.series("create-translations", "copy-translations-app")
  );
 });

@@ -115,9 +115,7 @@ gulp.task("webpack-prod-app", () =>

 gulp.task("webpack-dev-server-demo", () =>
  runDevServer({
-    compiler: webpack(
-      createDemoConfig({ isProdBuild: false, latestBuild: true })
-    ),
+    compiler: webpack(bothBuilds(createDemoConfig, { isProdBuild: false })),
    contentBase: paths.demo_output_root,
    port: 8090,
  })
@@ -133,9 +131,7 @@ gulp.task("webpack-prod-demo", () =>

 gulp.task("webpack-dev-server-cast", () =>
  runDevServer({
-    compiler: webpack(
-      createCastConfig({ isProdBuild: false, latestBuild: true })
-    ),
+    compiler: webpack(bothBuilds(createCastConfig, { isProdBuild: false })),
    contentBase: paths.cast_output_root,
    port: 8080,
    // Accessible from the network, because that's how Cast hits it.
@@ -178,9 +174,8 @@ gulp.task("webpack-prod-hassio", () =>

 gulp.task("webpack-dev-server-gallery", () =>
  runDevServer({
-    compiler: webpack(
-      createGalleryConfig({ isProdBuild: false, latestBuild: true })
-    ),
+    // We don't use the es5 build, but the dev server will fuck up the publicPath if we don't
+    compiler: webpack(bothBuilds(createGalleryConfig, { isProdBuild: false })),
    contentBase: paths.gallery_output_root,
    port: 8100,
    listenHost: "0.0.0.0",
--- a/build-scripts/util.cjs
+++ b/build-scripts/util.cjs
@@ -0,0 +1,16 @@
+const path = require("path");
+const fs = require("fs");
+
+// Helper function to map recursively over files in a folder and it's subfolders
+module.exports.mapFiles = function mapFiles(startPath, filter, mapFunc) {
+  const files = fs.readdirSync(startPath);
+  for (let i = 0; i < files.length; i++) {
+    const filename = path.join(startPath, files[i]);
+    const stat = fs.lstatSync(filename);
+    if (stat.isDirectory()) {
+      mapFiles(filename, filter, mapFunc);
+    } else if (filename.indexOf(filter) >= 0) {
+      mapFunc(filename);
+    }
+  }
+};
--- a/build-scripts/webpack.cjs
+++ b/build-scripts/webpack.cjs
@@ -7,10 +7,6 @@ const TerserPlugin = require("terser-webpack-plugin");
 const { WebpackManifestPlugin } = require("webpack-manifest-plugin");
 const log = require("fancy-log");
 const WebpackBar = require("webpackbar");
-const {
-  TransformAsyncModulesPlugin,
-} = require("transform-async-modules-webpack-plugin");
-const { dependencies } = require("../package.json");
 const paths = require("./paths.cjs");
 const bundle = require("./bundle.cjs");

@@ -146,6 +142,17 @@ const createWebpackConfig = ({
        ),
        path.resolve(paths.polymer_dir, "src/util/empty.js")
      ),
+      // See `src/resources/intl-polyfill-legacy.ts` for explanation
+      !latestBuild &&
+        new webpack.NormalModuleReplacementPlugin(
+          new RegExp(
+            path.resolve(paths.polymer_dir, "src/resources/intl-polyfill.ts")
+          ),
+          path.resolve(
+            paths.polymer_dir,
+            "src/resources/intl-polyfill-legacy.ts"
+          )
+        ),
      !isProdBuild && new LogStartCompilePlugin(),
      isProdBuild &&
        new StatsWriterPlugin({
@@ -156,16 +163,10 @@ const createWebpackConfig = ({
          stats: { assets: true, chunks: true, modules: true },
          transform: (stats) => JSON.stringify(filterStats(stats)),
        }),
-      !latestBuild &&
-        new TransformAsyncModulesPlugin({
-          browserslistEnv: "legacy",
-          runtime: { version: dependencies["@babel/runtime"] },
-        }),
    ].filter(Boolean),
    resolve: {
      extensions: [".ts", ".js", ".json"],
      alias: {
-        "lit/static-html$": "lit/static-html.js",
        "lit/decorators$": "lit/decorators.js",
        "lit/directive$": "lit/directive.js",
        "lit/directives/until$": "lit/directives/until.js",
--- a/cast/public/images/nabu-loves-hass.png
+++ b/cast/public/images/nabu-loves-hass.png
--- a/cast/src/launcher/layout/hc-cast.ts
+++ b/cast/src/launcher/layout/hc-cast.ts
@@ -1,6 +1,7 @@
 import "@material/mwc-button/mwc-button";
-import { ActionDetail } from "@material/mwc-list/mwc-list";
-import { mdiCast, mdiCastConnected, mdiViewDashboard } from "@mdi/js";
+import { mdiCast, mdiCastConnected } from "@mdi/js";
+import "@polymer/paper-item/paper-icon-item";
+import "@polymer/paper-listbox/paper-listbox";
 import { Auth, Connection } from "home-assistant-js-websocket";
 import { CSSResultGroup, LitElement, TemplateResult, css, html } from "lit";
 import { customElement, property, state } from "lit/decorators";
@@ -27,15 +28,14 @@ import { LovelaceViewConfig } from "../../../../src/data/lovelace/config/view";
 import "../../../../src/layouts/hass-loading-screen";
 import { generateDefaultViewConfig } from "../../../../src/panels/lovelace/common/generate-lovelace-config";
 import "./hc-layout";
-import "../../../../src/components/ha-list-item";

@customElement("hc-cast")
 class HcCast extends LitElement {
-  @property({ attribute: false }) public auth!: Auth;
+  @property() public auth!: Auth;

-  @property({ attribute: false }) public connection!: Connection;
+  @property() public connection!: Connection;

-  @property({ attribute: false }) public castManager!: CastManager;
+  @property() public castManager!: CastManager;

  @state() private askWrite = false;

@@ -83,37 +83,34 @@ class HcCast extends LitElement {
              `
            : html`
                <div class="section-header">PICK A VIEW</div>
-                <mwc-list @action=${this._handlePickView} activatable>
+                <paper-listbox
+                  attr-for-selected="data-path"
+                  .selected=${this.castManager.status.lovelacePath || ""}
+                >
                  ${(
                    this.lovelaceViews ?? [
                      generateDefaultViewConfig({}, {}, {}, {}, () => ""),
                    ]
                  ).map(
-                    (view, idx) =>
-                      html`<ha-list-item
-                        graphic="avatar"
-                        .activated=${this.castManager.status?.lovelacePath ===
-                        (view.path ?? idx)}
-                        .selected=${this.castManager.status?.lovelacePath ===
-                        (view.path ?? idx)}
+                    (view, idx) => html`
+                      <paper-icon-item
+                        @click=${this._handlePickView}
+                        data-path=${view.path || idx}
                      >
-                        ${view.title || view.path || "Unnamed view"}
                        ${view.icon
                          ? html`
                              <ha-icon
                                .icon=${view.icon}
-                                slot="graphic"
+                                slot="item-icon"
                              ></ha-icon>
                            `
-                          : html`<ha-svg-icon
-                              slot="item-icon"
-                              .path=${mdiViewDashboard}
-                            ></ha-svg-icon>`}</ha-list-item
-                      > `
-                  )}</mwc-list
-                >
+                          : ""}
+                        ${view.title || view.path}
+                      </paper-icon-item>
+                    `
+                  )}
+                </paper-listbox>
              `}
-
        <div class="card-actions">
          ${this.castManager.status
            ? html`
@@ -185,8 +182,8 @@ class HcCast extends LitElement {
    this.castManager.requestSession();
  }

-  private async _handlePickView(ev: CustomEvent<ActionDetail>) {
-    const path = this.lovelaceViews![ev.detail.index].path ?? ev.detail.index;
+  private async _handlePickView(ev: Event) {
+    const path = (ev.currentTarget as any).getAttribute("data-path");
    await ensureConnectedCastSession(this.castManager!, this.auth!);
    castSendShowLovelaceView(this.castManager, this.auth.data.hassUrl, path);
  }
@@ -244,19 +241,28 @@ class HcCast extends LitElement {

      mwc-button ha-svg-icon {
        margin-right: 8px;
-        margin-inline-end: 8px;
-        margin-inline-start: initial;
        height: 18px;
      }

-      ha-list-item ha-icon,
-      ha-list-item ha-svg-icon {
+      paper-listbox {
+        padding-top: 0;
+      }
+
+      paper-listbox ha-icon {
        padding: 12px;
        color: var(--secondary-text-color);
      }

-      :host([hide-icons]) ha-icon {
-        display: none;
+      paper-icon-item {
+        cursor: pointer;
+      }
+
+      paper-icon-item[disabled] {
+        cursor: initial;
+      }
+
+      :host([hide-icons]) paper-icon-item {
+        --paper-item-icon-width: 0px;
      }

      .spacer {
--- a/cast/src/launcher/layout/hc-layout.ts
+++ b/cast/src/launcher/layout/hc-layout.ts
@@ -10,13 +10,13 @@ import "../../../../src/components/ha-card";

@customElement("hc-layout")
 class HcLayout extends LitElement {
-  @property() public subtitle?: string;
+  @property() public subtitle?: string | undefined;

-  @property({ attribute: false }) public auth?: Auth;
+  @property() public auth?: Auth;

-  @property({ attribute: false }) public connection?: Connection;
+  @property() public connection?: Connection;

-  @property({ attribute: false }) public user?: HassUser;
+  @property() public user?: HassUser;

  protected render(): TemplateResult {
    return html`
--- a/cast/src/receiver/layout/hc-launch-screen.ts
+++ b/cast/src/receiver/layout/hc-launch-screen.ts
@@ -12,8 +12,8 @@ class HcLaunchScreen extends LitElement {
    return html`
      <div class="container">
        <img
-          alt="Nabu Casa logo on left, Home Assistant logo on right, and red heart in center"
-          src="https://cast.home-assistant.io/images/nabu-loves-hass.png"
+          alt="Home Assistant logo on left, Nabu Casa logo on right, and red heart in center"
+          src="https://www.home-assistant.io/images/blog/2018-09-thinking-big/social.png"
        />
        <div class="status">
          ${this.hass ? "Connected" : "Not Connected"}
@@ -28,23 +28,23 @@ class HcLaunchScreen extends LitElement {
      :host {
        display: block;
        height: 100vh;
-        background-color: #f2f4f9;
+        padding-top: 64px;
+        background-color: white;
        font-size: 24px;
      }
      .container {
        display: flex;
        flex-direction: column;
        text-align: center;
-        align-items: center;
-        height: 100%;
-        justify-content: space-evenly;
      }
      img {
-        max-width: 80%;
-        object-fit: cover;
+        width: 717px;
+        height: 376px;
+        display: block;
+        margin: 0 auto;
      }
      .status {
-        color: #1d2126;
+        padding-right: 54px;
      }
    `;
  }
--- a/cast/src/receiver/layout/hc-lovelace.ts
+++ b/cast/src/receiver/layout/hc-lovelace.ts
@@ -2,7 +2,6 @@ import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
 import { customElement, property, query } from "lit/decorators";
 import { fireEvent } from "../../../../src/common/dom/fire_event";
 import { LovelaceConfig } from "../../../../src/data/lovelace/config/types";
-import { getPanelTitleFromUrlPath } from "../../../../src/data/panel";
 import { Lovelace } from "../../../../src/panels/lovelace/types";
 import "../../../../src/panels/lovelace/views/hui-view";
 import { HomeAssistant } from "../../../../src/types";
@@ -18,7 +17,7 @@ class HcLovelace extends LitElement {
  @property({ attribute: false })
  public lovelaceConfig!: LovelaceConfig;

-  @property() public viewPath?: string | number | null;
+  @property() public viewPath?: string | number;

  @property() public urlPath: string | null = null;

@@ -62,12 +61,7 @@ class HcLovelace extends LitElement {
      const index = this._viewIndex;

      if (index !== undefined) {
-        const title = getPanelTitleFromUrlPath(
-          this.hass,
-          this.urlPath || "lovelace"
-        );
-
-        const dashboardTitle = title || this.urlPath;
+        const dashboardTitle = this.lovelaceConfig.title || this.urlPath;

        const viewTitle =
          this.lovelaceConfig.views[index].title ||
@@ -86,17 +80,10 @@ class HcLovelace extends LitElement {
          this.lovelaceConfig.views[index].background ||
          this.lovelaceConfig.background;

-        const backgroundStyle =
-          typeof configBackground === "string"
-            ? configBackground
-            : configBackground?.image
-              ? `center / cover no-repeat url('${configBackground.image}')`
-              : undefined;
-
-        if (backgroundStyle) {
+        if (configBackground) {
          this._huiView!.style.setProperty(
            "--lovelace-background",
-            backgroundStyle
+            configBackground
          );
        } else {
          this._huiView!.style.removeProperty("--lovelace-background");
@@ -106,9 +93,6 @@ class HcLovelace extends LitElement {
  }

  private get _viewIndex() {
-    if (this.viewPath === null) {
-      return 0;
-    }
    const selectedView = this.viewPath;
    const selectedViewInt = parseInt(selectedView as string, 10);
    for (let i = 0; i < this.lovelaceConfig.views.length; i++) {
--- a/cast/src/receiver/layout/hc-main.ts
+++ b/cast/src/receiver/layout/hc-main.ts
@@ -35,7 +35,6 @@ import { loadLovelaceResources } from "../../../../src/panels/lovelace/common/lo
 import { HassElement } from "../../../../src/state/hass-element";
 import { castContext } from "../cast_context";
 import "./hc-launch-screen";
-import { getPanelTitleFromUrlPath } from "../../../../src/data/panel";

 const DEFAULT_CONFIG: LovelaceDashboardStrategyConfig = {
  strategy: {
@@ -52,10 +51,10 @@ export class HcMain extends HassElement {

  @state() private _lovelacePath: string | number | null = null;

-  @state() private _urlPath?: string | null;
-
  @state() private _error?: string;

+  @state() private _urlPath?: string | null;
+
  private _hassUUID?: string;

  private _unsubLovelace?: UnsubscribeFunc;
@@ -82,7 +81,7 @@ export class HcMain extends HassElement {

    if (
      !this._lovelaceConfig ||
-      this._urlPath === undefined ||
+      this._lovelacePath === null ||
      // Guard against part of HA not being loaded yet.
      !this.hass ||
      !this.hass.states ||
@@ -100,8 +99,8 @@ export class HcMain extends HassElement {
      <hc-lovelace
        .hass=${this.hass}
        .lovelaceConfig=${this._lovelaceConfig}
-        .urlPath=${this._urlPath}
        .viewPath=${this._lovelacePath}
+        .urlPath=${this._urlPath}
        @config-refresh=${this._generateDefaultLovelaceConfig}
      ></hc-lovelace>
    `;
@@ -206,6 +205,7 @@ export class HcMain extends HassElement {
          expires_in: 0,
        }),
      });
+      this._hassUUID = msg.hassUUID;
    } catch (err: any) {
      const errorMessage = this._getErrorMessage(err);
      this._error = errorMessage;
@@ -225,17 +225,6 @@ export class HcMain extends HassElement {
      this.hass.connection.close();
    }
    this.initializeHass(auth, connection);
-    if (this._hassUUID !== msg.hassUUID) {
-      this._hassUUID = msg.hassUUID;
-      this._lovelaceConfig = undefined;
-      this._urlPath = undefined;
-      this._lovelacePath = null;
-      if (this._unsubLovelace) {
-        this._unsubLovelace();
-        this._unsubLovelace = undefined;
-      }
-      resourcesLoaded = false;
-    }
    this._error = undefined;
    this._sendStatus();
  }
@@ -244,7 +233,7 @@ export class HcMain extends HassElement {
    this._showDemo = false;
    // We should not get this command before we are connected.
    // Means a client got out of sync. Let's send status to them.
-    if (!this.hass?.connected) {
+    if (!this.hass) {
      this._sendStatus(msg.senderId!);
      this._error = "Cannot show Lovelace because we're not connected.";
      this._sendError(
@@ -271,7 +260,7 @@ export class HcMain extends HassElement {
    }

    this._error = undefined;
-    if (msg.urlPath === "lovelace" || msg.urlPath === undefined) {
+    if (msg.urlPath === "lovelace") {
      msg.urlPath = null;
    }
    this._lovelacePath = msg.viewPath;
@@ -286,7 +275,7 @@ export class HcMain extends HassElement {
        ],
      };
      this._urlPath = "energy";
-      this._lovelacePath = null;
+      this._lovelacePath = 0;
      this._sendStatus();
      return;
    }
@@ -295,7 +284,6 @@ export class HcMain extends HassElement {
      this._lovelaceConfig = undefined;
      if (this._unsubLovelace) {
        this._unsubLovelace();
-        this._unsubLovelace = undefined;
      }
      const llColl = atLeastVersion(this.hass.connection.haVersion, 0, 107)
        ? getLovelaceCollection(this.hass.connection, msg.urlPath)
@@ -360,11 +348,7 @@ export class HcMain extends HassElement {
  }

  private _handleNewLovelaceConfig(lovelaceConfig: LovelaceConfig) {
-    const title = getPanelTitleFromUrlPath(
-      this.hass!,
-      this._urlPath || "lovelace"
-    );
-    castContext.setApplicationState(title || "");
+    castContext.setApplicationState(lovelaceConfig.title || "");
    this._lovelaceConfig = lovelaceConfig;
  }

--- a/demo/src/configs/demo-configs.ts
+++ b/demo/src/configs/demo-configs.ts
@@ -4,7 +4,6 @@ import { energyEntities } from "../stubs/entities";
 import { DemoConfig } from "./types";

 export const demoConfigs: Array<() => Promise<DemoConfig>> = [
-  () => import("./sections").then((mod) => mod.demoSections),
  () => import("./arsaboo").then((mod) => mod.demoArsaboo),
  () => import("./teachingbirds").then((mod) => mod.demoTeachingbirds),
  () => import("./kernehed").then((mod) => mod.demoKernehed),
--- a/demo/src/configs/sections/description.ts
+++ b/demo/src/configs/sections/description.ts
@@ -1,16 +0,0 @@
-import { html } from "lit";
-import { DemoConfig } from "../types";
-
-export const demoLovelaceDescription: DemoConfig["description"] = (
-  localize
-) => html`
-  <p>
-    ${localize("ui.panel.page-demo.config.sections.description", {
-      blog_post: html`<a
-        href="https://www.home-assistant.io/blog/2024/03/04/dashboard-chapter-1/"
-        target="_blank"
-        >${localize("ui.panel.page-demo.config.sections.description_blog_post")}
-      </a>`,
-    })}
-  </p>
-`;
--- a/demo/src/configs/sections/entities.ts
+++ b/demo/src/configs/sections/entities.ts
@@ -1,474 +0,0 @@
-import { convertEntities } from "../../../../src/fake_data/entity";
-import { DemoConfig } from "../types";
-
-export const demoEntitiesSections: DemoConfig["entities"] = () =>
-  convertEntities({
-    "cover.living_room_garden_shutter": {
-      entity_id: "cover.living_room_garden_shutter",
-      state: "open",
-      attributes: {
-        current_position: 100,
-        device_class: "shutter",
-        friendly_name: "Living room garden shutter",
-        supported_features: 15,
-      },
-    },
-    "cover.living_room_graveyard_shutter": {
-      entity_id: "cover.living_room_graveyard_shutter",
-      state: "open",
-      attributes: {
-        current_position: 100,
-        device_class: "shutter",
-        friendly_name: "Living room graveyard shutter",
-        supported_features: 15,
-      },
-    },
-    "cover.living_room_left_shutter": {
-      entity_id: "cover.living_room_left_shutter",
-      state: "open",
-      attributes: {
-        current_position: 100,
-        device_class: "shutter",
-        friendly_name: "Living room left shutter",
-        supported_features: 15,
-      },
-    },
-    "cover.living_room_right_shutter": {
-      entity_id: "cover.living_room_right_shutter",
-      state: "open",
-      attributes: {
-        current_position: 100,
-        device_class: "shutter",
-        friendly_name: "Living room right shutter",
-        supported_features: 15,
-      },
-    },
-    "light.floor_lamp": {
-      entity_id: "light.floor_lamp",
-      state: "on",
-      attributes: {
-        min_color_temp_kelvin: 2000,
-        max_color_temp_kelvin: 6535,
-        min_mireds: 153,
-        max_mireds: 500,
-        supported_color_modes: ["color_temp", "xy"],
-        color_mode: "color_temp",
-        brightness: 178,
-        color_temp_kelvin: 2583,
-        color_temp: 387,
-        hs_color: [28.664, 69.597],
-        rgb_color: [255, 162, 77],
-        xy_color: [0.538, 0.389],
-        icon: "mdi:floor-lamp",
-        friendly_name: "Floor lamp",
-        supported_features: 44,
-      },
-    },
-    "light.living_room_spotlights": {
-      entity_id: "light.living_room_spotlights",
-      state: "on",
-      attributes: {
-        supported_color_modes: ["brightness"],
-        color_mode: "brightness",
-        brightness: 126,
-        icon: "mdi:ceiling-light-multiple",
-        friendly_name: "Living room spotlights",
-        supported_features: 32,
-      },
-    },
-    "light.bar_lamp": {
-      entity_id: "light.bar_lamp",
-      state: "on",
-      attributes: {
-        min_color_temp_kelvin: 2202,
-        max_color_temp_kelvin: 4504,
-        min_mireds: 222,
-        max_mireds: 454,
-        effect_list: ["None", "candle"],
-        supported_color_modes: ["color_temp"],
-        effect: null,
-        color_mode: null,
-        brightness: null,
-        color_temp_kelvin: null,
-        color_temp: null,
-        hs_color: null,
-        rgb_color: null,
-        xy_color: null,
-        mode: "normal",
-        dynamics: "none",
-        icon: "mdi:lightbulb-variant",
-        friendly_name: "Bar lamp",
-        supported_features: 44,
-      },
-    },
-    "sensor.living_room_temperature": {
-      entity_id: "sensor.living_room_temperature",
-      state: "22.8",
-      attributes: {
-        state_class: "measurement",
-        unit_of_measurement: "°C",
-        device_class: "temperature",
-        friendly_name: "Living room Temperature",
-      },
-    },
-    "media_player.living_room_nest_mini": {
-      entity_id: "media_player.living_room_nest_mini",
-      state: "off",
-      attributes: {
-        device_class: "speaker",
-        friendly_name: "Living room Nest Mini",
-        supported_features: 152461,
-      },
-    },
-    "cover.kitchen_shutter": {
-      entity_id: "cover.kitchen_shutter",
-      state: "open",
-      attributes: {
-        current_position: 100,
-        device_class: "shutter",
-        friendly_name: "Kitchen shutter ",
-        supported_features: 15,
-      },
-    },
-    "light.kitchen_spotlights": {
-      entity_id: "light.kitchen_spotlights",
-      state: "off",
-      attributes: {
-        supported_color_modes: ["brightness"],
-        color_mode: null,
-        brightness: null,
-        icon: "mdi:ceiling-light-multiple",
-        friendly_name: "Kitchen spotlights ",
-        supported_features: 32,
-      },
-    },
-    "light.worktop_spotlights": {
-      entity_id: "light.worktop_spotlights",
-      state: "off",
-      attributes: {
-        supported_color_modes: ["brightness"],
-        color_mode: null,
-        brightness: null,
-        icon: "mdi:ceiling-light-multiple",
-        friendly_name: "Worktop spotlights ",
-        supported_features: 32,
-      },
-    },
-    "binary_sensor.fridge_door": {
-      entity_id: "binary_sensor.fridge_door",
-      state: "off",
-      attributes: {
-        device_class: "door",
-        icon: "mdi:fridge",
-        friendly_name: "Fridge door",
-      },
-    },
-    "media_player.kitchen_nest_audio": {
-      entity_id: "media_player.kitchen_nest_audio",
-      state: "on",
-      attributes: {
-        device_class: "speaker",
-        friendly_name: "Kitchen Nest Audio",
-        supported_features: 152461,
-      },
-    },
-    "binary_sensor.tesla_wall_connector_vehicle_connected": {
-      entity_id: "binary_sensor.tesla_wall_connector_vehicle_connected",
-      state: "off",
-      attributes: {
-        device_class: "plug",
-        friendly_name: "Wall Connector Vehicle connected",
-      },
-    },
-    "sensor.tesla_wall_connector_session_energy": {
-      entity_id: "sensor.tesla_wall_connector_session_energy",
-      state: "16.3",
-      attributes: {
-        state_class: "total_increasing",
-        unit_of_measurement: "kWh",
-        device_class: "energy",
-        friendly_name: "Tesla Wall Connector Session energy",
-      },
-    },
-    "sensor.electric_meter_power": {
-      entity_id: "sensor.electric_meter_power",
-      state: "797.86",
-      attributes: {
-        state_class: "measurement",
-        unit_of_measurement: "W",
-        device_class: "power",
-        icon: "mdi:meter-electric",
-        friendly_name: "Electric meter Power",
-      },
-    },
-    "sensor.eletric_meter_voltage": {
-      entity_id: "sensor.eletric_meter_voltage",
-      state: "232.19",
-      attributes: {
-        state_class: "measurement",
-        unit_of_measurement: "V",
-        device_class: "voltage",
-        friendly_name: "Electric meter voltage",
-      },
-    },
-    "sensor.electricity_maps_grid_fossil_fuel_percentage": {
-      entity_id: "sensor.electricity_maps_grid_fossil_fuel_percentage",
-      state: "9.84",
-      attributes: {
-        state_class: "measurement",
-        country_code: "FR",
-        unit_of_measurement: "%",
-        attribution: "Data provided by Electricity Maps",
-        icon: "mdi:barrel",
-        friendly_name: "Electricity Maps Grid fossil fuel percentage",
-      },
-    },
-    "sensor.electricity_maps_co2_intensity": {
-      entity_id: "sensor.electricity_maps_co2_intensity",
-      state: "62.0",
-      attributes: {
-        state_class: "measurement",
-        country_code: "FR",
-        unit_of_measurement: "gCO2eq/kWh",
-        attribution: "Data provided by Electricity Maps",
-        friendly_name: "Electricity Maps CO2 intensity",
-        icon: "mdi:molecule-co2",
-      },
-    },
-    "sun.sun": {
-      entity_id: "sun.sun",
-      state: "above_horizon",
-      attributes: {
-        next_dawn: "2024-03-05T05:50:21.964405+00:00",
-        next_dusk: "2024-03-04T18:08:54.311334+00:00",
-        next_midnight: "2024-03-05T00:00:00+00:00",
-        next_noon: "2024-03-05T12:00:05+00:00",
-        next_rising: "2024-03-05T06:23:42.739159+00:00",
-        next_setting: "2024-03-04T17:35:26.271171+00:00",
-        elevation: 30.38,
-        azimuth: 204.42,
-        rising: false,
-        friendly_name: "Sun",
-      },
-    },
-    "sensor.rain": {
-      entity_id: "sensor.moon_phase",
-      state: "7.2",
-      attributes: {
-        state_class: "total_increasing",
-        unit_of_measurement: "mm",
-        device_class: "precipitation",
-        friendly_name: "Rain",
-      },
-    },
-    "climate.ground_floor": {
-      entity_id: "climate.ground_floor",
-      state: "heat",
-      attributes: {
-        hvac_modes: ["auto", "heat", "off"],
-        min_temp: 7,
-        max_temp: 35,
-        preset_modes: [
-          "comfort",
-          "away",
-          "eco",
-          "frost_protection",
-          "external",
-          "home",
-        ],
-        current_temperature: 20.8,
-        temperature: 21,
-        preset_mode: "comfort",
-        icon: "mdi:home-floor-0",
-        friendly_name: "Ground floor Thermostat",
-        supported_features: 401,
-      },
-    },
-    "climate.first_floor": {
-      entity_id: "climate.first_floor",
-      state: "heat",
-      attributes: {
-        hvac_modes: ["auto", "heat", "off"],
-        min_temp: 7,
-        max_temp: 35,
-        preset_modes: [
-          "comfort",
-          "away",
-          "eco",
-          "frost_protection",
-          "external",
-          "home",
-        ],
-        current_temperature: 21.7,
-        temperature: 21,
-        preset_mode: "comfort",
-        icon: "mdi:home-floor-1",
-        friendly_name: "First floor Thermostat",
-        supported_features: 401,
-      },
-    },
-    "cover.study_shutter": {
-      entity_id: "cover.study_shutter",
-      state: "open",
-      attributes: {
-        current_position: 100,
-        device_class: "shutter",
-        friendly_name: "Study shutter",
-        supported_features: 15,
-      },
-    },
-    "light.study_spotlights": {
-      entity_id: "light.study_spotlights",
-      state: "off",
-      attributes: {
-        supported_color_modes: ["brightness"],
-        color_mode: null,
-        brightness: null,
-        icon: "mdi:ceiling-light-multiple",
-        friendly_name: "Study spotlights",
-        supported_features: 32,
-      },
-    },
-    "media_player.study_nest_hub": {
-      entity_id: "media_player.study_nest_hub",
-      state: "off",
-      attributes: {
-        friendly_name: "Study Nest Hub",
-        supported_features: 152461,
-      },
-    },
-    "sensor.standing_desk_height": {
-      entity_id: "sensor.standing_desk_height",
-      state: "72",
-      attributes: {
-        unit_of_measurement: "cm",
-        icon: "mdi:tape-measure",
-        friendly_name: "Standing desk Height",
-      },
-    },
-    "light.outdoor_light": {
-      entity_id: "light.outdoor_light",
-      state: "on",
-      attributes: {
-        supported_color_modes: ["brightness"],
-        color_mode: null,
-        brightness: 255,
-        icon: "mdi:outdoor-lamp",
-        friendly_name: "Outdoor light",
-        supported_features: 32,
-      },
-    },
-    "light.flood_light": {
-      entity_id: "light.flood_light",
-      state: "off",
-      attributes: {
-        effect_list: ["None", "candle"],
-        supported_color_modes: ["brightness"],
-        effect: null,
-        color_mode: null,
-        brightness: null,
-        mode: "normal",
-        dynamics: "none",
-        icon: "mdi:light-flood-down",
-        friendly_name: "Flood light",
-        supported_features: 44,
-      },
-    },
-    "sensor.outdoor_motion_sensor_temperature": {
-      entity_id: "sensor.outdoor_motion_sensor_temperature",
-      state: "10.2",
-      attributes: {
-        state_class: "measurement",
-        unit_of_measurement: "°C",
-        device_class: "temperature",
-        friendly_name: "Outdoor motion sensor Temperature",
-      },
-    },
-    "binary_sensor.outdoor_motion_sensor_motion": {
-      entity_id: "binary_sensor.outdoor_motion_sensor_motion",
-      state: "off",
-      attributes: {
-        device_class: "motion",
-        friendly_name: "Outdoor motion sensor Motion",
-      },
-    },
-    "sensor.outdoor_motion_sensor_illuminance": {
-      entity_id: "sensor.outdoor_motion_sensor_illuminance",
-      state: "555",
-      attributes: {
-        state_class: "measurement",
-        light_level: 27444,
-        unit_of_measurement: "lx",
-        device_class: "illuminance",
-        friendly_name: "Outdoor motion sensor Illuminance",
-      },
-    },
-    "automation.home_assistant_auto_update": {
-      entity_id: "automation.home_assistant_auto_update",
-      state: "off",
-      attributes: {
-        id: "1700669321947",
-        last_triggered: "2024-02-29T18:02:05.343139+00:00",
-        mode: "queued",
-        current: 0,
-        max: 50,
-        icon: "mdi:auto-mode",
-        friendly_name: "Home Assistant Auto-update",
-      },
-    },
-    "update.home_assistant_operating_system_update": {
-      entity_id: "update.home_assistant_operating_system_update",
-      state: "off",
-      attributes: {
-        auto_update: false,
-        installed_version: "12.1",
-        in_progress: false,
-        latest_version: "12.1",
-        release_summary: null,
-        release_url:
-          "https://github.com/home-assistant/operating-system/commits/dev",
-        skipped_version: null,
-        title: "Home Assistant Operating System",
-        entity_picture:
-          "https://brands.home-assistant.io/homeassistant/icon.png",
-        friendly_name: "Home Assistant Operating System Update",
-        supported_features: 3,
-      },
-    },
-    "update.home_assistant_supervisor_update": {
-      entity_id: "update.home_assistant_supervisor_update",
-      state: "off",
-      attributes: {
-        auto_update: true,
-        installed_version: "2024.02.2",
-        in_progress: false,
-        latest_version: "2024.02.2",
-        release_summary: null,
-        release_url:
-          "https://github.com/home-assistant/supervisor/commits/main",
-        skipped_version: null,
-        title: "Home Assistant Supervisor",
-        entity_picture: "https://brands.home-assistant.io/hassio/icon.png",
-        friendly_name: "Home Assistant Supervisor Update",
-        supported_features: 1,
-      },
-    },
-    "update.home_assistant_core_update": {
-      entity_id: "update.home_assistant_supervisor_update",
-      state: "off",
-      attributes: {
-        auto_update: false,
-        installed_version: "2024.4.0",
-        in_progress: false,
-        latest_version: "2024.4.0",
-        release_summary: null,
-        release_url: "https://github.com/home-assistant/core/commits/dev",
-        skipped_version: null,
-        title: "Home Assistant Core",
-        entity_picture:
-          "https://brands.home-assistant.io/homeassistant/icon.png",
-        friendly_name: "Home Assistant Core Update",
-        supported_features: 11,
-      },
-    },
-  });
--- a/demo/src/configs/sections/index.ts
+++ b/demo/src/configs/sections/index.ts
@@ -1,14 +0,0 @@
-import { DemoConfig } from "../types";
-import { demoLovelaceDescription } from "./description";
-import { demoEntitiesSections } from "./entities";
-import { demoLovelaceSections } from "./lovelace";
-
-export const demoSections: DemoConfig = {
-  authorName: "Home Assistant",
-  authorUrl: "https://github.com/home-assistant/frontend/",
-  name: "Home Demo",
-  description: demoLovelaceDescription,
-  lovelace: demoLovelaceSections,
-  entities: demoEntitiesSections,
-  theme: () => ({}),
-};
--- a/demo/src/configs/sections/lovelace.ts
+++ b/demo/src/configs/sections/lovelace.ts
@@ -1,281 +0,0 @@
-import { DemoConfig } from "../types";
-
-export const demoLovelaceSections: DemoConfig["lovelace"] = () => ({
-  title: "Home Assistant Demo",
-  views: [
-    {
-      type: "sections",
-      title: "Demo",
-      path: "home",
-      icon: "mdi:home-assistant",
-      sections: [
-        {
-          title: "Welcome 👋",
-          cards: [{ type: "custom:ha-demo-card" }],
-        },
-        {
-          cards: [
-            {
-              type: "tile",
-              entity: "cover.living_room_garden_shutter",
-              name: "Garden",
-            },
-            {
-              type: "tile",
-              entity: "cover.living_room_graveyard_shutter",
-              name: "Rear",
-            },
-            {
-              type: "tile",
-              entity: "cover.living_room_left_shutter",
-              name: "Left",
-            },
-            {
-              type: "tile",
-              entity: "cover.living_room_right_shutter",
-              name: "Right",
-            },
-            {
-              type: "tile",
-              entity: "light.floor_lamp",
-            },
-            {
-              type: "tile",
-              entity: "light.living_room_spotlights",
-              name: "Spotlights",
-              features: [
-                {
-                  type: "light-brightness",
-                },
-              ],
-            },
-            {
-              type: "tile",
-              entity: "light.bar_lamp",
-            },
-            {
-              graph: "line",
-              type: "sensor",
-              entity: "sensor.living_room_temperature",
-              detail: 1,
-              name: "Temperature",
-            },
-            {
-              type: "tile",
-              entity: "media_player.living_room_nest_mini",
-              name: "Nest Mini",
-            },
-          ],
-          title: "🛋️ Living room ",
-        },
-        {
-          type: "grid",
-          cards: [
-            {
-              type: "tile",
-              entity: "cover.kitchen_shutter",
-              name: "Shutter",
-            },
-            {
-              type: "tile",
-              entity: "light.kitchen_spotlights",
-              name: "Spotlights",
-              features: [
-                {
-                  type: "light-brightness",
-                },
-              ],
-            },
-            {
-              type: "tile",
-              entity: "light.worktop_spotlights",
-              name: "Worktop",
-            },
-            {
-              type: "tile",
-              entity: "binary_sensor.fridge_door",
-              name: "Fridge",
-            },
-            {
-              type: "tile",
-              entity: "media_player.kitchen_nest_audio",
-              name: "Nest Audio",
-            },
-          ],
-          title: "👩‍🍳 Kitchen",
-        },
-        {
-          type: "grid",
-          cards: [
-            {
-              type: "tile",
-              entity: "binary_sensor.tesla_wall_connector_vehicle_connected",
-              name: "EV",
-              icon: "mdi:car",
-            },
-            {
-              type: "tile",
-              entity: "sensor.tesla_wall_connector_session_energy",
-              name: "Last charge",
-              color: "green",
-            },
-            {
-              type: "tile",
-              entity: "sensor.electric_meter_power",
-              color: "deep-orange",
-              name: "Home power",
-            },
-            {
-              type: "tile",
-              entity: "sensor.eletric_meter_voltage",
-              name: "Voltage",
-              color: "deep-orange",
-            },
-            {
-              type: "tile",
-              entity: "sensor.electricity_maps_grid_fossil_fuel_percentage",
-              name: "Fossil fuel",
-              color: "brown",
-            },
-            {
-              type: "tile",
-              entity: "sensor.electricity_maps_co2_intensity",
-              name: "CO2 Intensity",
-              color: "dark-grey",
-            },
-          ],
-          title: "⚡️ Energy",
-        },
-        {
-          type: "grid",
-          cards: [
-            {
-              type: "tile",
-              entity: "sun.sun",
-            },
-            {
-              type: "tile",
-              entity: "sensor.rain",
-              color: "blue",
-            },
-            {
-              features: [
-                {
-                  type: "target-temperature",
-                },
-              ],
-              type: "tile",
-              name: "Downstairs",
-              entity: "climate.ground_floor",
-              state_content: ["preset_mode", "current_temperature"],
-            },
-            {
-              features: [
-                {
-                  type: "target-temperature",
-                },
-              ],
-              type: "tile",
-              name: "Upstairs",
-              entity: "climate.first_floor",
-              state_content: ["preset_mode", "current_temperature"],
-            },
-          ],
-          title: "🌤️ Climate",
-        },
-        {
-          type: "grid",
-          cards: [
-            {
-              type: "tile",
-              entity: "cover.study_shutter",
-              name: "Shutter",
-            },
-            {
-              type: "tile",
-              entity: "light.study_spotlights",
-              name: "Spotlights",
-            },
-            {
-              type: "tile",
-              entity: "media_player.study_nest_hub",
-              name: "Nest Hub",
-            },
-            {
-              type: "tile",
-              entity: "sensor.standing_desk_height",
-              name: "Desk",
-              color: "brown",
-              icon: "mdi:desk",
-            },
-          ],
-          title: "🧑‍💻 Study",
-        },
-        {
-          type: "grid",
-          cards: [
-            {
-              type: "tile",
-              entity: "light.outdoor_light",
-              name: "Door light",
-            },
-            {
-              type: "tile",
-              entity: "light.flood_light",
-            },
-            {
-              graph: "line",
-              type: "sensor",
-              entity: "sensor.outdoor_motion_sensor_temperature",
-              detail: 1,
-              name: "Temperature",
-            },
-            {
-              type: "tile",
-              entity: "binary_sensor.outdoor_motion_sensor_motion",
-              name: "Motion",
-              color: "blue",
-            },
-            {
-              type: "tile",
-              entity: "sensor.outdoor_motion_sensor_illuminance",
-              color: "amber",
-              name: "Illuminance",
-            },
-          ],
-          title: "🌳 Outdoor",
-        },
-        {
-          type: "grid",
-          cards: [
-            {
-              type: "tile",
-              entity: "automation.home_assistant_auto_update",
-              name: "Auto-update",
-              color: "green",
-            },
-            {
-              type: "tile",
-              entity: "update.home_assistant_operating_system_update",
-              name: "OS",
-              icon: "mdi:home-assistant",
-            },
-            {
-              type: "tile",
-              entity: "update.home_assistant_supervisor_update",
-              icon: "mdi:home-assistant",
-              name: "Supervisor",
-            },
-            {
-              type: "tile",
-              entity: "update.home_assistant_core_update",
-              name: "Core",
-              icon: "mdi:home-assistant",
-            },
-          ],
-          title: "🎉 Updates",
-        },
-      ],
-    },
-  ],
-});
--- a/demo/src/configs/types.ts
+++ b/demo/src/configs/types.ts
@@ -1,4 +1,3 @@
-import { TemplateResult } from "lit";
 import { LocalizeFunc } from "../../../src/common/translations/localize";
 import { LovelaceConfig } from "../../../src/data/lovelace/config/types";
 import { Entity } from "../../../src/fake_data/entity";
@@ -8,9 +7,6 @@ export interface DemoConfig {
  name: string;
  authorName: string;
  authorUrl: string;
-  description?:
-    | string
-    | ((localize: LocalizeFunc) => string | TemplateResult<1>);
  lovelace: (localize: LocalizeFunc) => LovelaceConfig;
  entities: (localize: LocalizeFunc) => Entity[];
  theme: () => Record<string, string> | null;
--- a/demo/src/custom-cards/ha-demo-card.ts
+++ b/demo/src/custom-cards/ha-demo-card.ts
@@ -1,9 +1,8 @@
+import "@material/mwc-button";
 import { css, CSSResultGroup, html, LitElement, nothing } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import { until } from "lit/directives/until";
-import { fireEvent } from "../../../src/common/dom/fire_event";
 import "../../../src/components/ha-card";
-import "../../../src/components/ha-button";
 import "../../../src/components/ha-circular-progress";
 import { LovelaceCardConfig } from "../../../src/data/lovelace/config/card";
 import { MockHomeAssistant } from "../../../src/fake_data/provide_hass";
@@ -12,6 +11,7 @@ import {
  demoConfigs,
  selectedDemoConfig,
  selectedDemoConfigIndex,
+  setDemoConfig,
 } from "../configs/demo-configs";

@customElement("ha-demo-card")
@@ -39,57 +39,38 @@ export class HADemoCard extends LitElement implements LovelaceCard {
        <div class="picker">
          <div class="label">
            ${this._switching
-              ? html`
-                  <ha-circular-progress indeterminate></ha-circular-progress>
-                `
+              ? html`<ha-circular-progress
+                  indeterminate
+                ></ha-circular-progress>`
              : until(
                  selectedDemoConfig.then(
                    (conf) => html`
                      ${conf.name}
                      <small>
-                        ${this.hass.localize(
-                          "ui.panel.page-demo.cards.demo.demo_by",
-                          {
-                            name: html`
-                              <a target="_blank" href=${conf.authorUrl}>
-                                ${conf.authorName}
-                              </a>
-                            `,
-                          }
-                        )}
+                        <a target="_blank" href=${conf.authorUrl}>
+                          ${this.hass.localize(
+                            "ui.panel.page-demo.cards.demo.demo_by",
+                            { name: conf.authorName }
+                          )}
+                        </a>
                      </small>
                    `
                  ),
                  ""
                )}
          </div>
-
-          <ha-button @click=${this._nextConfig} .disabled=${this._switching}>
+          <mwc-button @click=${this._nextConfig} .disabled=${this._switching}>
            ${this.hass.localize("ui.panel.page-demo.cards.demo.next_demo")}
-          </ha-button>
+          </mwc-button>
        </div>
-        <div class="content">
-          <p class="small-hidden">
-            ${this.hass.localize("ui.panel.page-demo.cards.demo.introduction")}
-          </p>
-          ${until(
-            selectedDemoConfig.then((conf) => {
-              if (typeof conf.description === "function") {
-                return conf.description(this.hass.localize);
-              }
-              if (conf.description) {
-                return html`<p>${conf.description}</p>`;
-              }
-              return nothing;
-            }),
-            nothing
-          )}
+        <div class="content small-hidden">
+          ${this.hass.localize("ui.panel.page-demo.cards.demo.introduction")}
        </div>
        <div class="actions small-hidden">
          <a href="https://www.home-assistant.io" target="_blank">
-            <ha-button>
+            <mwc-button>
              ${this.hass.localize("ui.panel.page-demo.cards.demo.learn_more")}
-            </ha-button>
+            </mwc-button>
          </a>
        </div>
      </ha-card>
@@ -113,7 +94,13 @@ export class HADemoCard extends LitElement implements LovelaceCard {

  private async _updateConfig(index: number) {
    this._switching = true;
-    fireEvent(this, "set-demo-config" as any, { index });
+    try {
+      await setDemoConfig(this.hass, this.lovelace!, index);
+    } catch (err: any) {
+      alert("Failed to switch config :-(");
+    } finally {
+      this._switching = false;
+    }
  }

  static get styles(): CSSResultGroup {
@@ -121,7 +108,6 @@ export class HADemoCard extends LitElement implements LovelaceCard {
      css`
        a {
          color: var(--primary-color);
-          display: inline-block;
        }

        .actions a {
@@ -129,11 +115,7 @@ export class HADemoCard extends LitElement implements LovelaceCard {
        }

        .content {
-          padding: 0 16px;
-        }
-
-        .content p {
-          margin: 16px 0;
+          padding: 16px;
        }

        .picker {
@@ -143,7 +125,7 @@ export class HADemoCard extends LitElement implements LovelaceCard {
          height: 60px;
        }

-        .picker ha-button {
+        .picker mwc-button {
          margin-right: 8px;
        }

@@ -156,8 +138,9 @@ export class HADemoCard extends LitElement implements LovelaceCard {
        }

        .actions {
-          padding: 0px 8px 4px 8px;
+          padding-left: 8px;
        }
+
        @media only screen and (max-width: 500px) {
          .small-hidden {
            display: none;
--- a/demo/src/ha-demo.ts
+++ b/demo/src/ha-demo.ts
@@ -10,7 +10,6 @@ import {
 import { HomeAssistantAppEl } from "../../src/layouts/home-assistant";
 import { HomeAssistant } from "../../src/types";
 import { selectedDemoConfig } from "./configs/demo-configs";
-import { mockAreaRegistry } from "./stubs/area_registry";
 import { mockAuth } from "./stubs/auth";
 import { mockConfigEntries } from "./stubs/config_entries";
 import { mockEnergy } from "./stubs/energy";
@@ -18,16 +17,14 @@ import { energyEntities } from "./stubs/entities";
 import { mockEntityRegistry } from "./stubs/entity_registry";
 import { mockEvents } from "./stubs/events";
 import { mockFrontend } from "./stubs/frontend";
-import { mockIcons } from "./stubs/icons";
 import { mockHistory } from "./stubs/history";
 import { mockLovelace } from "./stubs/lovelace";
 import { mockMediaPlayer } from "./stubs/media_player";
 import { mockPersistentNotification } from "./stubs/persistent_notification";
 import { mockRecorder } from "./stubs/recorder";
-import { mockSensor } from "./stubs/sensor";
+import { mockTodo } from "./stubs/todo";
 import { mockSystemLog } from "./stubs/system_log";
 import { mockTemplate } from "./stubs/template";
-import { mockTodo } from "./stubs/todo";
 import { mockTranslations } from "./stubs/translations";

@customElement("ha-demo")
@@ -53,17 +50,14 @@ export class HaDemo extends HomeAssistantAppEl {
    mockHistory(hass);
    mockRecorder(hass);
    mockTodo(hass);
-    mockSensor(hass);
    mockSystemLog(hass);
    mockTemplate(hass);
    mockEvents(hass);
    mockMediaPlayer(hass);
    mockFrontend(hass);
-    mockIcons(hass);
    mockEnergy(hass);
    mockPersistentNotification(hass);
    mockConfigEntries(hass);
-    mockAreaRegistry(hass);
    mockEntityRegistry(hass, [
      {
        config_entry_id: "co2signal",
@@ -74,8 +68,6 @@ export class HaDemo extends HomeAssistantAppEl {
        id: "sensor.co2_intensity",
        name: null,
        icon: null,
-        labels: [],
-        categories: {},
        platform: "co2signal",
        hidden_by: null,
        entity_category: null,
@@ -92,8 +84,6 @@ export class HaDemo extends HomeAssistantAppEl {
        id: "sensor.co2_intensity",
        name: null,
        icon: null,
-        labels: [],
-        categories: {},
        platform: "co2signal",
        hidden_by: null,
        entity_category: null,
--- a/demo/src/stubs/area_registry.ts
+++ b/demo/src/stubs/area_registry.ts
@@ -4,11 +4,4 @@ import type { MockHomeAssistant } from "../../../src/fake_data/provide_hass";
 export const mockAreaRegistry = (
  hass: MockHomeAssistant,
  data: AreaRegistryEntry[] = []
-) => {
-  hass.mockWS("config/area_registry/list", () => data);
-  const areas = {};
-  data.forEach((area) => {
-    areas[area.area_id] = area;
-  });
-  hass.updateHass({ areas });
-};
+) => hass.mockWS("config/area_registry/list", () => data);
--- a/demo/src/stubs/config_entries.ts
+++ b/demo/src/stubs/config_entries.ts
@@ -10,7 +10,6 @@ export const mockConfigEntries = (hass: MockHomeAssistant) => {
    supports_options: false,
    supports_remove_device: false,
    supports_unload: true,
-    supports_reconfigure: true,
    pref_disable_new_entities: false,
    pref_disable_polling: false,
    disabled_by: null,
--- a/demo/src/stubs/device_registry.ts
+++ b/demo/src/stubs/device_registry.ts
@@ -4,11 +4,4 @@ import type { MockHomeAssistant } from "../../../src/fake_data/provide_hass";
 export const mockDeviceRegistry = (
  hass: MockHomeAssistant,
  data: DeviceRegistryEntry[] = []
-) => {
-  hass.mockWS("config/device_registry/list", () => data);
-  const devices = {};
-  data.forEach((device) => {
-    devices[device.id] = device;
-  });
-  hass.updateHass({ devices });
-};
+) => hass.mockWS("config/device_registry/list", () => data);
--- a/demo/src/stubs/energy.ts
+++ b/demo/src/stubs/energy.ts
@@ -1,4 +1,4 @@
-import { format, startOfToday, startOfTomorrow } from "date-fns";
+import { format, startOfToday, startOfTomorrow } from "date-fns/esm";
 import {
  EnergyInfo,
  EnergyPreferences,
--- a/demo/src/stubs/floor_registry.ts
+++ b/demo/src/stubs/floor_registry.ts
@@ -1,7 +0,0 @@
-import { FloorRegistryEntry } from "../../../src/data/floor_registry";
-import type { MockHomeAssistant } from "../../../src/fake_data/provide_hass";
-
-export const mockFloorRegistry = (
-  hass: MockHomeAssistant,
-  data: FloorRegistryEntry[] = []
-) => hass.mockWS("config/floor_registry/list", () => data);
--- a/demo/src/stubs/icons.ts
+++ b/demo/src/stubs/icons.ts
@@ -1,33 +0,0 @@
-import { IconCategory } from "../../../src/data/icons";
-import { ENTITY_COMPONENT_ICONS } from "../../../src/fake_data/entity_component_icons";
-import { MockHomeAssistant } from "../../../src/fake_data/provide_hass";
-
-export const mockIcons = (hass: MockHomeAssistant) => {
-  hass.mockWS(
-    "frontend/get_icons",
-    async ({
-      category,
-      integration,
-    }: {
-      category: IconCategory;
-      integration?: string;
-    }) => {
-      if (integration) {
-        try {
-          const response = await fetch(
-            `https://raw.githubusercontent.com/home-assistant/core/dev/homeassistant/components/${integration}/icons.json`
-          ).then((resp) => resp.json());
-          return { resources: { [integration]: response[category] || {} } };
-        } catch {
-          return { resources: {} };
-        }
-      }
-      if (category === "entity_component") {
-        return {
-          resources: ENTITY_COMPONENT_ICONS,
-        };
-      }
-      return { resources: {} };
-    }
-  );
-};
--- a/demo/src/stubs/label_registry.ts
+++ b/demo/src/stubs/label_registry.ts
@@ -1,7 +0,0 @@
-import { LabelRegistryEntry } from "../../../src/data/label_registry";
-import type { MockHomeAssistant } from "../../../src/fake_data/provide_hass";
-
-export const mockLabelRegistry = (
-  hass: MockHomeAssistant,
-  data: LabelRegistryEntry[] = []
-) => hass.mockWS("config/label_registry/list", () => data);
--- a/demo/src/stubs/lovelace.ts
+++ b/demo/src/stubs/lovelace.ts
@@ -1,12 +1,9 @@
 import type { LocalizeFunc } from "../../../src/common/translations/localize";
 import type { MockHomeAssistant } from "../../../src/fake_data/provide_hass";
-import {
-  selectedDemoConfig,
-  selectedDemoConfigIndex,
-  setDemoConfig,
-} from "../configs/demo-configs";
+import { selectedDemoConfig } from "../configs/demo-configs";
 import "../custom-cards/cast-demo-row";
 import "../custom-cards/ha-demo-card";
+import type { HADemoCard } from "../custom-cards/ha-demo-card";

 export const mockLovelace = (
  hass: MockHomeAssistant,
@@ -22,22 +19,17 @@ export const mockLovelace = (
  hass.mockWS("lovelace/resources", () => Promise.resolve([]));
 };

-customElements.whenDefined("hui-root").then(() => {
+customElements.whenDefined("hui-view").then(() => {
  // eslint-disable-next-line
-  const HUIRoot = customElements.get("hui-root")!;
+  const HUIView = customElements.get("hui-view");
+  // Patch HUI-VIEW to make the lovelace object available to the demo card
+  const oldCreateCard = HUIView!.prototype.createCardElement;

-  const oldFirstUpdated = HUIRoot.prototype.firstUpdated;
-
-  HUIRoot.prototype.firstUpdated = function (changedProperties) {
-    oldFirstUpdated.call(this, changedProperties);
-    this.addEventListener("set-demo-config", async (ev) => {
-      const index = (ev as CustomEvent).detail.index;
-      try {
-        await setDemoConfig(this.hass, this.lovelace!, index);
-      } catch (err: any) {
-        setDemoConfig(this.hass, this.lovelace!, selectedDemoConfigIndex);
-        alert("Failed to switch config :-(");
-      }
-    });
+  HUIView!.prototype.createCardElement = function (config) {
+    const el = oldCreateCard.call(this, config);
+    if (el.tagName === "HA-DEMO-CARD") {
+      (el as HADemoCard).lovelace = this.lovelace;
+    }
+    return el;
  };
 });
--- a/demo/src/stubs/sensor.ts
+++ b/demo/src/stubs/sensor.ts
@@ -1,58 +0,0 @@
-import { MockHomeAssistant } from "../../../src/fake_data/provide_hass";
-
-export const mockSensor = (hass: MockHomeAssistant) => {
-  hass.mockWS("sensor/numeric_device_classes", () => [
-    {
-      numeric_device_classes: [
-        "volume_storage",
-        "gas",
-        "data_size",
-        "irradiance",
-        "wind_speed",
-        "volatile_organic_compounds",
-        "volatile_organic_compounds_parts",
-        "voltage",
-        "frequency",
-        "precipitation_intensity",
-        "volume",
-        "precipitation",
-        "battery",
-        "nitrogen_dioxide",
-        "speed",
-        "signal_strength",
-        "pm1",
-        "nitrous_oxide",
-        "atmospheric_pressure",
-        "data_rate",
-        "temperature",
-        "power_factor",
-        "aqi",
-        "current",
-        "volume_flow_rate",
-        "humidity",
-        "duration",
-        "ozone",
-        "distance",
-        "pressure",
-        "pm25",
-        "weight",
-        "energy",
-        "carbon_monoxide",
-        "apparent_power",
-        "illuminance",
-        "energy_storage",
-        "moisture",
-        "power",
-        "water",
-        "carbon_dioxide",
-        "ph",
-        "reactive_power",
-        "monetary",
-        "nitrogen_monoxide",
-        "pm10",
-        "sound_pressure",
-        "sulphur_dioxide",
-      ],
-    },
-  ]);
-};
--- a/demo/src/stubs/todo.ts
+++ b/demo/src/stubs/todo.ts
@@ -21,5 +21,4 @@ export const mockTodo = (hass: MockHomeAssistant) => {
      },
    ] as TodoItem[],
  }));
-  hass.mockWS("todo/item/subscribe", (_msg, _hass) => () => {});
 };
--- a/gallery/src/components/demo-black-white-row.ts
+++ b/gallery/src/components/demo-black-white-row.ts
@@ -1,5 +1,5 @@
 import { Button } from "@material/mwc-button";
-import { html, LitElement, css, TemplateResult, nothing } from "lit";
+import { html, LitElement, css, TemplateResult } from "lit";
 import { customElement, property } from "lit/decorators";
 import { applyThemesOnElement } from "../../../src/common/dom/apply_themes_on_element";
 import { fireEvent } from "../../../src/common/dom/fire_event";
@@ -9,9 +9,9 @@ import "../../../src/components/ha-card";
 class DemoBlackWhiteRow extends LitElement {
  @property() title!: string;

-  @property() value?: any;
+  @property() value!: any;

-  @property({ type: Boolean }) public disabled = false;
+  @property() disabled = false;

  protected render(): TemplateResult {
    return html`
@@ -45,9 +45,7 @@ class DemoBlackWhiteRow extends LitElement {
              </mwc-button>
            </div>
          </ha-card>
-          ${this.value
-            ? html`<pre>${JSON.stringify(this.value, undefined, 2)}</pre>`
-            : nothing}
+          <pre>${JSON.stringify(this.value, undefined, 2)}</pre>
        </div>
      </div>
    `;
--- a/gallery/src/components/demo-card.ts
+++ b/gallery/src/components/demo-card.ts
@@ -1,9 +1,7 @@
 import { load } from "js-yaml";
-import { LitElement, PropertyValueMap, css, html, nothing } from "lit";
+import { html, css, LitElement, PropertyValues } from "lit";
 import { customElement, property, query, state } from "lit/decorators";
-import memoizeOne from "memoize-one";
-import "../../../src/panels/lovelace/cards/hui-card";
-import type { HuiCard } from "../../../src/panels/lovelace/cards/hui-card";
+import { createCardElement } from "../../../src/panels/lovelace/create-element/create-card-element";
 import { HomeAssistant } from "../../../src/types";

 export interface DemoCardConfig {
@@ -13,20 +11,15 @@ export interface DemoCardConfig {

@customElement("demo-card")
 class DemoCard extends LitElement {
-  @property({ attribute: false }) public hass!: HomeAssistant;
+  @property() public hass!: HomeAssistant;

-  @property({ attribute: false }) public config!: DemoCardConfig;
+  @property() public config!: DemoCardConfig;

-  @property({ type: Boolean }) public showConfig = false;
+  @property() public showConfig = false;

  @state() private _size?: number;

-  @query("hui-card", false) private _card?: HuiCard;
-
-  private _config = memoizeOne((config: string) => {
-    const c = (load(config) as any)[0];
-    return c;
-  });
+  @query("#card") private _card!: HTMLElement;

  render() {
    return html`
@@ -37,32 +30,63 @@ class DemoCard extends LitElement {
          : ""}
      </h2>
      <div class="root">
-        <hui-card
-          .config=${this._config(this.config.config)}
-          .hass=${this.hass}
-          @card-updated=${this._cardUpdated}
-        ></hui-card>
-        ${this.showConfig
-          ? html`<pre>${this.config.config.trim()}</pre>`
-          : nothing}
+        <div id="card"></div>
+        ${this.showConfig ? html`<pre>${this.config.config.trim()}</pre>` : ""}
      </div>
    `;
  }

-  private async _cardUpdated(ev) {
-    ev.stopPropagation();
-    this._updateSize();
+  updated(changedProps: PropertyValues) {
+    super.updated(changedProps);
+
+    if (changedProps.has("config")) {
+      const card = this._card;
+      while (card.lastChild) {
+        card.removeChild(card.lastChild);
+      }
+
+      const el = this._createCardElement((load(this.config.config) as any)[0]);
+      card.appendChild(el);
+      this._getSize(el);
+    }
+
+    if (changedProps.has("hass")) {
+      const card = this._card.lastChild;
+      if (card) {
+        (card as any).hass = this.hass;
+      }
+    }
  }

-  private async _updateSize() {
-    this._size = await this._card?.getCardSize();
+  async _getSize(el) {
+    await customElements.whenDefined(el.localName);
+
+    if (!("getCardSize" in el)) {
+      this._size = undefined;
+      return;
+    }
+    this._size = await el.getCardSize();
  }

-  protected update(
-    _changedProperties: PropertyValueMap<any> | Map<PropertyKey, unknown>
-  ): void {
-    super.update(_changedProperties);
-    this._updateSize();
+  _createCardElement(cardConfig) {
+    const element = createCardElement(cardConfig);
+    if (this.hass) {
+      element.hass = this.hass;
+    }
+    element.addEventListener(
+      "ll-rebuild",
+      (ev) => {
+        ev.stopPropagation();
+        this._rebuildCard(element, cardConfig);
+      },
+      { once: true }
+    );
+    return element;
+  }
+
+  _rebuildCard(cardElToReplace, config) {
+    const newCardEl = this._createCardElement(config);
+    cardElToReplace.parentElement.replaceChild(newCardEl, cardElToReplace);
  }

  static styles = css`
@@ -77,7 +101,7 @@ class DemoCard extends LitElement {
      font-size: 0.5em;
      color: var(--primary-text-color);
    }
-    hui-card {
+    #card {
      max-width: 400px;
      width: 100vw;
    }
--- a/gallery/src/components/demo-cards.ts
+++ b/gallery/src/components/demo-cards.ts
@@ -10,9 +10,9 @@ import "../ha-demo-options";

@customElement("demo-cards")
 class DemoCards extends LitElement {
-  @property({ attribute: false }) public configs!: DemoCardConfig[];
+  @property() public configs!: DemoCardConfig[];

-  @property({ attribute: false }) public hass!: HomeAssistant;
+  @property() public hass!: HomeAssistant;

  @state() private _showConfig = false;

--- a/gallery/src/components/demo-more-info.ts
+++ b/gallery/src/components/demo-more-info.ts
@@ -8,11 +8,11 @@ import { HomeAssistant } from "../../../src/types";

@customElement("demo-more-info")
 class DemoMoreInfo extends LitElement {
-  @property({ attribute: false }) public hass!: HomeAssistant;
+  @property() public hass!: HomeAssistant;

  @property() public entityId!: string;

-  @property({ type: Boolean }) public showConfig = false;
+  @property() public showConfig!: boolean;

  render() {
    const state = this._getState(this.entityId, this.hass.states);
--- a/gallery/src/components/demo-more-infos.ts
+++ b/gallery/src/components/demo-more-infos.ts
@@ -1,19 +1,19 @@
 import { LitElement, css, html } from "lit";
-import { customElement, property, state } from "lit/decorators";
+import { customElement, property } from "lit/decorators";
 import { applyThemesOnElement } from "../../../src/common/dom/apply_themes_on_element";
 import "../../../src/components/ha-formfield";
 import "../../../src/components/ha-switch";
-import { HomeAssistant } from "../../../src/types";
-import "../ha-demo-options";
 import "./demo-more-info";
+import "../ha-demo-options";
+import { HomeAssistant } from "../../../src/types";

@customElement("demo-more-infos")
 class DemoMoreInfos extends LitElement {
-  @property({ attribute: false }) public hass!: HomeAssistant;
+  @property() public hass!: HomeAssistant;

-  @property({ type: Array }) public entities!: string[];
+  @property() public entities!: [];

-  @state() private _showConfig = false;
+  @property({ attribute: false }) _showConfig: boolean = false;

  render() {
    return html`
--- a/gallery/src/data/demo_states.js
+++ b/gallery/src/data/demo_states.js
@@ -509,7 +509,7 @@ export default {
      away_mode: "on",
      aux_heat: "off",
      unit_of_measurement: "°C",
-      friendly_name: "HVAC",
+      friendly_name: "Hvac",
      supported_features: 3833,
    },
    last_changed: "2018-07-19T10:44:46.200650+00:00",
--- a/gallery/src/data/traces/basic_trace.ts
+++ b/gallery/src/data/traces/basic_trace.ts
@@ -17,7 +17,6 @@ export const basicTrace: DemoTrace = {
        {
          path: "trigger/0",
          timestamp: "2021-03-25T04:36:51.223693+00:00",
-          changed_variables: {},
        },
      ],
      "condition/0": [
--- a/gallery/src/data/traces/motion-light-trace.ts
+++ b/gallery/src/data/traces/motion-light-trace.ts
@@ -17,7 +17,6 @@ export const motionLightTrace: DemoTrace = {
        {
          path: "trigger/0",
          timestamp: "2021-03-25T04:36:51.223693+00:00",
-          changed_variables: {},
        },
      ],
      "action/0": [
--- a/gallery/src/ha-gallery.ts
+++ b/gallery/src/ha-gallery.ts
@@ -1,14 +1,14 @@
+import { mdiMenu } from "@mdi/js";
 import "@material/mwc-drawer";
 import "@material/mwc-top-app-bar-fixed";
-import { mdiMenu } from "@mdi/js";
-import { LitElement, PropertyValues, css, html } from "lit";
-import { customElement, query, state } from "lit/decorators";
-import { dynamicElement } from "../../src/common/dom/dynamic-element-directive";
-import { HaExpansionPanel } from "../../src/components/ha-expansion-panel";
+import { html, css, LitElement, PropertyValues } from "lit";
+import { customElement, property, query } from "lit/decorators";
 import "../../src/components/ha-icon-button";
 import "../../src/managers/notification-manager";
+import { HaExpansionPanel } from "../../src/components/ha-expansion-panel";
 import { haStyle } from "../../src/resources/styles";
 import { PAGES, SIDEBAR } from "../build/import-pages";
+import { dynamicElement } from "../../src/common/dom/dynamic-element-directive";
 import "./components/page-description";

 const GITHUB_DEMO_URL =
@@ -24,7 +24,7 @@ const FAKE_HASS = {

@customElement("ha-gallery")
 class HaGallery extends LitElement {
-  @state() private _page =
+  @property() private _page =
    document.location.hash.substring(1) ||
    `${SIDEBAR[0].category}/${SIDEBAR[0].pages![0]}`;

--- a/gallery/src/pages/automation/describe-action.ts
+++ b/gallery/src/pages/automation/describe-action.ts
@@ -64,12 +64,6 @@ const ACTIONS = [
      entity_id: "input_boolean.toggle_4",
    },
  },
-  {
-    sequence: [
-      { scene: "scene.kitchen_morning" },
-      { service: "light.turn_off", target: { entity_id: "light.kitchen" } },
-    ],
-  },
  {
    parallel: [
      { scene: "scene.kitchen_morning" },
@@ -142,7 +136,7 @@ export class DemoAutomationDescribeAction extends LitElement {
        <div class="action">
          <span>
            ${this._action
-              ? describeAction(this.hass, [], [], [], this._action)
+              ? describeAction(this.hass, [], this._action)
              : "<invalid YAML>"}
          </span>
          <ha-yaml-editor
@@ -155,7 +149,7 @@ export class DemoAutomationDescribeAction extends LitElement {
        ${ACTIONS.map(
          (conf) => html`
            <div class="action">
-              <span>${describeAction(this.hass, [], [], [], conf as any)}</span>
+              <span>${describeAction(this.hass, [], conf as any)}</span>
              <pre>${dump(conf)}</pre>
            </div>
          `
--- a/gallery/src/pages/automation/describe-condition.ts
+++ b/gallery/src/pages/automation/describe-condition.ts
@@ -21,10 +21,10 @@ const ENTITIES = [
  }),
 ];

-const conditions: Condition[] = [
-  { condition: "and", conditions: [] },
-  { condition: "not", conditions: [] },
-  { condition: "or", conditions: [] },
+const conditions = [
+  { condition: "and" },
+  { condition: "not" },
+  { condition: "or" },
  { condition: "state", entity_id: "light.kitchen", state: "on" },
  {
    condition: "numeric_state",
@@ -34,11 +34,11 @@ const conditions: Condition[] = [
    above: 20,
  },
  { condition: "sun", after: "sunset" },
-  { condition: "sun", after: "sunrise", before_offset: 3600 },
+  { condition: "sun", after: "sunrise", offset: "-01:00" },
  { condition: "zone", entity_id: "device_tracker.person", zone: "zone.home" },
  { condition: "trigger", id: "motion" },
  { condition: "time" },
-  { condition: "template", value_template: "" },
+  { condition: "template" },
 ];

 const initialCondition: Condition = {
--- a/gallery/src/pages/automation/editor-action.ts
+++ b/gallery/src/pages/automation/editor-action.ts
@@ -20,7 +20,6 @@ import { HaWaitForTriggerAction } from "../../../../src/panels/config/automation
 import { HaWaitAction } from "../../../../src/panels/config/automation/action/types/ha-automation-action-wait_template";
 import { Action } from "../../../../src/data/script";
 import { HaConditionAction } from "../../../../src/panels/config/automation/action/types/ha-automation-action-condition";
-import { HaSequenceAction } from "../../../../src/panels/config/automation/action/types/ha-automation-action-sequence";
 import { HaParallelAction } from "../../../../src/panels/config/automation/action/types/ha-automation-action-parallel";
 import { HaIfAction } from "../../../../src/panels/config/automation/action/types/ha-automation-action-if";
 import { HaStopAction } from "../../../../src/panels/config/automation/action/types/ha-automation-action-stop";
@@ -40,7 +39,6 @@ const SCHEMAS: { name: string; actions: Action[] }[] = [
  { name: "If-Then", actions: [HaIfAction.defaultConfig] },
  { name: "Choose", actions: [HaChooseAction.defaultConfig] },
  { name: "Variables", actions: [{ variables: { hello: "1" } }] },
-  { name: "Sequence", actions: [HaSequenceAction.defaultConfig] },
  { name: "Parallel", actions: [HaParallelAction.defaultConfig] },
  { name: "Stop", actions: [HaStopAction.defaultConfig] },
 ];
--- a/gallery/src/pages/automation/editor-condition.ts
+++ b/gallery/src/pages/automation/editor-condition.ts
@@ -80,7 +80,7 @@ const SCHEMAS: { name: string; conditions: ConditionWithShorthand[] }[] = [
 ];

@customElement("demo-automation-editor-condition")
-export class DemoAutomationEditorCondition extends LitElement {
+class DemoHaAutomationEditorCondition extends LitElement {
  @state() private hass!: HomeAssistant;

  @state() private _disabled = false;
@@ -155,6 +155,6 @@ export class DemoAutomationEditorCondition extends LitElement {

 declare global {
  interface HTMLElementTagNameMap {
-    "demo-automation-editor-condition": DemoAutomationEditorCondition;
+    "demo-ha-automation-editor-condition": DemoHaAutomationEditorCondition;
  }
 }
--- a/gallery/src/pages/automation/editor-trigger.ts
+++ b/gallery/src/pages/automation/editor-trigger.ts
@@ -126,7 +126,7 @@ const SCHEMAS: { name: string; triggers: Trigger[] }[] = [
 ];

@customElement("demo-automation-editor-trigger")
-export class DemoAutomationEditorTrigger extends LitElement {
+class DemoHaAutomationEditorTrigger extends LitElement {
  @state() private hass!: HomeAssistant;

  @state() private _disabled = false;
@@ -201,6 +201,6 @@ export class DemoAutomationEditorTrigger extends LitElement {

 declare global {
  interface HTMLElementTagNameMap {
-    "demo-automation-editor-trigger": DemoAutomationEditorTrigger;
+    "demo-ha-automation-editor-trigger": DemoHaAutomationEditorTrigger;
  }
 }
--- a/gallery/src/pages/automation/trace-timeline.ts
+++ b/gallery/src/pages/automation/trace-timeline.ts
@@ -3,6 +3,7 @@
 import { css, html, LitElement, nothing } from "lit";
 import { customElement, property } from "lit/decorators";
 import "../../../../src/components/ha-card";
+import "../../../../src/components/trace/hat-script-graph";
 import "../../../../src/components/trace/hat-trace-timeline";
 import { provideHass } from "../../../../src/fake_data/provide_hass";
 import { HomeAssistant } from "../../../../src/types";
@@ -55,7 +56,6 @@ export class DemoAutomationTraceTimeline extends LitElement {
    super.firstUpdated(changedProps);
    const hass = provideHass(this);
    hass.updateTranslations(null, "en");
-    hass.updateTranslations("config", "en");
  }

  static get styles() {
--- a/gallery/src/pages/automation/trace.ts
+++ b/gallery/src/pages/automation/trace.ts
@@ -60,7 +60,6 @@ export class DemoAutomationTrace extends LitElement {
    super.firstUpdated(changedProps);
    const hass = provideHass(this);
    hass.updateTranslations(null, "en");
-    hass.updateTranslations("config", "en");
  }

  static get styles() {
--- a/gallery/src/pages/components/ha-control-button.ts
+++ b/gallery/src/pages/components/ha-control-button.ts
@@ -59,7 +59,7 @@ export class DemoHaBarButton extends LitElement {
              <ha-control-button
                class=${ifDefined(btn.class)}
                label=${ifDefined(btn.label)}
-                ?disabled=${btn.disabled}
+                disabled=${ifDefined(btn.disabled)}
              >
                <ha-svg-icon .path=${btn.icon || mdiLightbulb}></ha-svg-icon>
              </ha-control-button>
@@ -162,7 +162,7 @@ export class DemoHaBarButton extends LitElement {
      }
      .custom-group {
        --control-button-group-thickness: 100px;
-        --control-button-group-border-radius: 36px;
+        --control-button-group-border-radius: 18px;
        --control-button-group-spacing: 20px;
      }
      .custom-group ha-control-button {
--- a/gallery/src/pages/components/ha-control-number-buttons.ts
+++ b/gallery/src/pages/components/ha-control-number-buttons.ts
@@ -94,7 +94,7 @@ export class DemoHarControlNumberButtons extends LitElement {
        --control-number-buttons-background-color: #2196f3;
        --control-number-buttons-background-opacity: 0.1;
        --control-number-buttons-thickness: 100px;
-        --control-number-buttons-border-radius: 36px;
+        --control-number-buttons-border-radius: 24px;
      }
    `;
  }
--- a/gallery/src/pages/components/ha-control-select.ts
+++ b/gallery/src/pages/components/ha-control-select.ts
@@ -135,7 +135,7 @@ export class DemoHaControlSelect extends LitElement {
                class=${ifDefined(config.class)}
                @value-changed=${this.handleValueChanged}
                aria-labelledby=${id}
-                ?disabled=${config.disabled}
+                disabled=${ifDefined(config.disabled)}
              >
              </ha-control-select>
            </div>
@@ -156,7 +156,7 @@ export class DemoHaControlSelect extends LitElement {
                  class=${ifDefined(config.class)}
                  @value-changed=${this.handleValueChanged}
                  aria-labelledby=${id}
-                  ?disabled=${config.disabled}
+                  disabled=${ifDefined(config.disabled)}
                >
                </ha-control-select>
              `;
@@ -186,8 +186,8 @@ export class DemoHaControlSelect extends LitElement {
      .custom {
        --mdc-icon-size: 24px;
        --control-select-color: var(--state-fan-active-color);
-        --control-select-thickness: 130px;
-        --control-select-border-radius: 36px;
+        --control-select-thickness: 100px;
+        --control-select-border-radius: 24px;
      }
      .vertical-selects {
        height: 300px;
--- a/gallery/src/pages/components/ha-control-slider.ts
+++ b/gallery/src/pages/components/ha-control-slider.ts
@@ -150,8 +150,8 @@ export class DemoHaBarSlider extends LitElement {
        --control-slider-color: #ffcf4c;
        --control-slider-background: #ffcf4c;
        --control-slider-background-opacity: 0.2;
-        --control-slider-thickness: 130px;
-        --control-slider-border-radius: 36px;
+        --control-slider-thickness: 100px;
+        --control-slider-border-radius: 24px;
      }
      .vertical-sliders {
        height: 300px;
--- a/gallery/src/pages/components/ha-control-switch.ts
+++ b/gallery/src/pages/components/ha-control-switch.ts
@@ -63,8 +63,8 @@ export class DemoHaControlSwitch extends LitElement {
                .pathOn=${mdiLightbulb}
                .pathOff=${mdiLightbulbOff}
                aria-labelledby=${id}
-                ?disabled=${config.disabled}
-                ?reversed=${config.reversed}
+                disabled=${ifDefined(config.disabled)}
+                reversed=${ifDefined(config.reversed)}
              >
              </ha-control-switch>
            </div>
@@ -86,8 +86,8 @@ export class DemoHaControlSwitch extends LitElement {
                  aria-label=${label}
                  .pathOn=${mdiGarageOpen}
                  .pathOff=${mdiGarage}
-                  ?disabled=${config.disabled}
-                  ?reversed=${config.reversed}
+                  disabled=${ifDefined(config.disabled)}
+                  reversed=${ifDefined(config.reversed)}
                >
                </ha-control-switch>
              `;
@@ -117,8 +117,8 @@ export class DemoHaControlSwitch extends LitElement {
      .custom {
        --control-switch-on-color: var(--green-color);
        --control-switch-off-color: var(--red-color);
-        --control-switch-thickness: 130px;
-        --control-switch-border-radius: 36px;
+        --control-switch-thickness: 100px;
+        --control-switch-border-radius: 24px;
        --control-switch-padding: 6px;
        --mdc-icon-size: 24px;
      }
--- a/gallery/src/pages/components/ha-expansion-panel.ts
+++ b/gallery/src/pages/components/ha-expansion-panel.ts
@@ -3,7 +3,6 @@ import { css, html, LitElement, TemplateResult } from "lit";
 import { customElement } from "lit/decorators";
 import "../../../../src/components/ha-card";
 import "../../../../src/components/ha-expansion-panel";
-import "../../../../src/components/ha-icon-button";
 import "../../../../src/components/ha-markdown";
 import "../../components/demo-black-white-row";
 import { LONG_TEXT } from "../../data/text";
--- a/gallery/src/pages/components/ha-form.ts
+++ b/gallery/src/pages/components/ha-form.ts
@@ -10,7 +10,6 @@ import { mockHassioSupervisor } from "../../../../demo/src/stubs/hassio_supervis
 import { computeInitialHaFormData } from "../../../../src/components/ha-form/compute-initial-ha-form-data";
 import "../../../../src/components/ha-form/ha-form";
 import type { HaFormSchema } from "../../../../src/components/ha-form/types";
-import type { AreaRegistryEntry } from "../../../../src/data/area_registry";
 import { getEntity } from "../../../../src/fake_data/entity";
 import { provideHass } from "../../../../src/fake_data/provide_hass";
 import { HomeAssistant } from "../../../../src/types";
@@ -59,7 +58,6 @@ const DEVICES = [
    hw_version: null,
    via_device_id: null,
    serial_number: null,
-    labels: [],
  },
  {
    area_id: "backyard",
@@ -78,7 +76,6 @@ const DEVICES = [
    hw_version: null,
    via_device_id: null,
    serial_number: null,
-    labels: [],
  },
  {
    area_id: null,
@@ -97,37 +94,27 @@ const DEVICES = [
    hw_version: null,
    via_device_id: null,
    serial_number: null,
-    labels: [],
  },
 ];

-const AREAS: AreaRegistryEntry[] = [
+const AREAS = [
  {
    area_id: "backyard",
-    floor_id: null,
    name: "Backyard",
-    icon: null,
    picture: null,
    aliases: [],
-    labels: [],
  },
  {
    area_id: "bedroom",
-    floor_id: null,
    name: "Bedroom",
-    icon: "mdi:bed",
    picture: null,
    aliases: [],
-    labels: [],
  },
  {
    area_id: "livingroom",
-    floor_id: null,
    name: "Livingroom",
-    icon: "mdi:sofa",
    picture: null,
    aliases: [],
-    labels: [],
  },
 ];

--- a/gallery/src/pages/components/ha-selector.ts
+++ b/gallery/src/pages/components/ha-selector.ts
@@ -9,7 +9,6 @@ import { mockEntityRegistry } from "../../../../demo/src/stubs/entity_registry";
 import { mockHassioSupervisor } from "../../../../demo/src/stubs/hassio_supervisor";
 import "../../../../src/components/ha-selector/ha-selector";
 import "../../../../src/components/ha-settings-row";
-import type { AreaRegistryEntry } from "../../../../src/data/area_registry";
 import { BlueprintInput } from "../../../../src/data/blueprint";
 import { showDialog } from "../../../../src/dialogs/make-dialog-manager";
 import { getEntity } from "../../../../src/fake_data/entity";
@@ -17,10 +16,6 @@ import { provideHass } from "../../../../src/fake_data/provide_hass";
 import { ProvideHassElement } from "../../../../src/mixins/provide-hass-lit-mixin";
 import type { HomeAssistant } from "../../../../src/types";
 import "../../components/demo-black-white-row";
-import { FloorRegistryEntry } from "../../../../src/data/floor_registry";
-import { LabelRegistryEntry } from "../../../../src/data/label_registry";
-import { mockFloorRegistry } from "../../../../demo/src/stubs/floor_registry";
-import { mockLabelRegistry } from "../../../../demo/src/stubs/label_registry";

 const ENTITIES = [
  getEntity("alarm_control_panel", "alarm", "disarmed", {
@@ -59,7 +54,6 @@ const DEVICES = [
    hw_version: null,
    via_device_id: null,
    serial_number: null,
-    labels: [],
  },
  {
    area_id: "backyard",
@@ -78,7 +72,6 @@ const DEVICES = [
    hw_version: null,
    via_device_id: null,
    serial_number: null,
-    labels: [],
  },
  {
    area_id: null,
@@ -97,78 +90,27 @@ const DEVICES = [
    hw_version: null,
    via_device_id: null,
    serial_number: null,
-    labels: [],
  },
 ];

-const AREAS: AreaRegistryEntry[] = [
+const AREAS = [
  {
    area_id: "backyard",
-    floor_id: "ground",
    name: "Backyard",
-    icon: null,
    picture: null,
    aliases: [],
-    labels: [],
  },
  {
    area_id: "bedroom",
-    floor_id: "first",
    name: "Bedroom",
-    icon: "mdi:bed",
    picture: null,
    aliases: [],
-    labels: [],
  },
  {
    area_id: "livingroom",
-    floor_id: "ground",
    name: "Livingroom",
-    icon: "mdi:sofa",
    picture: null,
    aliases: [],
-    labels: [],
-  },
-];
-
-const FLOORS: FloorRegistryEntry[] = [
-  {
-    floor_id: "ground",
-    name: "Ground floor",
-    level: 0,
-    icon: null,
-    aliases: [],
-  },
-  {
-    floor_id: "first",
-    name: "First floor",
-    level: 1,
-    icon: "mdi:numeric-1",
-    aliases: [],
-  },
-  {
-    floor_id: "second",
-    name: "Second floor",
-    level: 2,
-    icon: "mdi:numeric-2",
-    aliases: [],
-  },
-];
-
-const LABELS: LabelRegistryEntry[] = [
-  {
-    label_id: "energy",
-    name: "Energy",
-    icon: null,
-    color: "yellow",
-    description: null,
-  },
-  {
-    label_id: "entertainment",
-    name: "Entertainment",
-    icon: "mdi:popcorn",
-    color: "blue",
-    description: null,
  },
 ];

@@ -179,12 +121,7 @@ const SCHEMAS: {
  {
    name: "One of each",
    input: {
-      label: { name: "Label", selector: { label: {} } },
-      floor: { name: "Floor", selector: { floor: {} } },
-      area: { name: "Area", selector: { area: {} } },
-      device: { name: "Device", selector: { device: {} } },
      entity: { name: "Entity", selector: { entity: {} } },
-      target: { name: "Target", selector: { target: {} } },
      state: {
        name: "State",
        selector: { state: { entity_id: "alarm_control_panel.alarm" } },
@@ -193,12 +130,15 @@ const SCHEMAS: {
        name: "Attribute",
        selector: { attribute: { entity_id: "" } },
      },
+      device: { name: "Device", selector: { device: {} } },
      config_entry: {
        name: "Integration",
        selector: { config_entry: {} },
      },
      duration: { name: "Duration", selector: { duration: {} } },
      addon: { name: "Addon", selector: { addon: {} } },
+      area: { name: "Area", selector: { area: {} } },
+      target: { name: "Target", selector: { target: {} } },
      number_box: {
        name: "Number Box",
        selector: {
@@ -331,14 +271,6 @@ const SCHEMAS: {
        selector: { color_temp: {} },
      },
      color_rgb: { name: "Color", selector: { color_rgb: {} } },
-      qr_code: {
-        name: "QR Code",
-        selector: { qr_code: { data: "https://home-assistant.io" } },
-      },
-      constant: {
-        name: "Constant",
-        selector: { constant: { value: true, label: "Yes!" } },
-      },
    },
  },
  {
@@ -347,8 +279,6 @@ const SCHEMAS: {
      entity: { name: "Entity", selector: { entity: { multiple: true } } },
      device: { name: "Device", selector: { device: { multiple: true } } },
      area: { name: "Area", selector: { area: { multiple: true } } },
-      floor: { name: "Floor", selector: { floor: { multiple: true } } },
-      label: { name: "Label", selector: { label: { multiple: true } } },
      select: {
        name: "Select Multiple",
        selector: {
@@ -405,8 +335,6 @@ class DemoHaSelector extends LitElement implements ProvideHassElement {
    mockDeviceRegistry(hass, DEVICES);
    mockConfigEntries(hass);
    mockAreaRegistry(hass, AREAS);
-    mockFloorRegistry(hass, FLOORS);
-    mockLabelRegistry(hass, LABELS);
    mockHassioSupervisor(hass);
    hass.mockWS("auth/sign_path", (params) => params);
    hass.mockWS("media_player/browse_media", this._browseMedia);
@@ -569,7 +497,7 @@ class DemoHaSelector extends LitElement implements ProvideHassElement {
          this.requestUpdate();
        };
        return html`
-          <demo-black-white-row .title=${info.name}>
+          <demo-black-white-row .title=${info.name} .value=${this.data[idx]}>
            ${["light", "dark"].map((slot) =>
              Object.entries(info.input).map(
                ([key, value]) => html`
@@ -602,8 +530,8 @@ class DemoHaSelector extends LitElement implements ProvideHassElement {
  }

  static styles = css`
-    ha-settings-row {
-      --paper-item-body-two-line-min-height: 0;
+    ha-selector {
+      width: 60;
    }
    .options {
      max-width: 800px;
--- a/gallery/src/pages/date-time/date-time-numeric.ts
+++ b/gallery/src/pages/date-time/date-time-numeric.ts
@@ -1,20 +1,19 @@
-import "@material/mwc-list/mwc-list";
-import { LitElement, css, html } from "lit";
+import { html, css, LitElement } from "lit";
 import { customElement, state } from "lit/decorators";
-import { formatDateTimeNumeric } from "../../../../src/common/datetime/format_date_time";
 import "../../../../src/components/ha-card";
 import "../../../../src/components/ha-control-select";
+import { translationMetadata } from "../../../../src/resources/translations-metadata";
+import { formatDateTimeNumeric } from "../../../../src/common/datetime/format_date_time";
+import { timeOptions } from "../../data/date-options";
+import { demoConfig } from "../../../../src/fake_data/demo_config";
 import {
-  DateFormat,
-  FirstWeekday,
  FrontendLocaleData,
  NumberFormat,
  TimeFormat,
+  DateFormat,
+  FirstWeekday,
  TimeZone,
 } from "../../../../src/data/translation";
-import { demoConfig } from "../../../../src/fake_data/demo_config";
-import { translationMetadata } from "../../../../src/resources/translations-metadata";
-import { timeOptions } from "../../data/date-options";

@customElement("demo-date-time-date-time-numeric")
 export class DemoDateTimeDateTimeNumeric extends LitElement {
@@ -56,46 +55,48 @@ export class DemoDateTimeDateTimeNumeric extends LitElement {
          <div class="center">12 Hours</div>
          <div class="center">24 Hours</div>
        </div>
-        ${Object.entries(translationMetadata.translations).map(
-          ([key, value]) => html`
-            <div class="container">
-              <div>${value.nativeName}</div>
-              <div class="center">
-                ${formatDateTimeNumeric(
-                  this.date,
-                  {
-                    ...defaultLocale,
-                    language: key,
-                    time_format: TimeFormat.language,
-                  },
-                  demoConfig
-                )}
+        ${Object.entries(translationMetadata.translations)
+          .filter(([key, _]) => key !== "test")
+          .map(
+            ([key, value]) => html`
+              <div class="container">
+                <div>${value.nativeName}</div>
+                <div class="center">
+                  ${formatDateTimeNumeric(
+                    this.date,
+                    {
+                      ...defaultLocale,
+                      language: key,
+                      time_format: TimeFormat.language,
+                    },
+                    demoConfig
+                  )}
+                </div>
+                <div class="center">
+                  ${formatDateTimeNumeric(
+                    this.date,
+                    {
+                      ...defaultLocale,
+                      language: key,
+                      time_format: TimeFormat.am_pm,
+                    },
+                    demoConfig
+                  )}
+                </div>
+                <div class="center">
+                  ${formatDateTimeNumeric(
+                    this.date,
+                    {
+                      ...defaultLocale,
+                      language: key,
+                      time_format: TimeFormat.twenty_four,
+                    },
+                    demoConfig
+                  )}
+                </div>
              </div>
-              <div class="center">
-                ${formatDateTimeNumeric(
-                  this.date,
-                  {
-                    ...defaultLocale,
-                    language: key,
-                    time_format: TimeFormat.am_pm,
-                  },
-                  demoConfig
-                )}
-              </div>
-              <div class="center">
-                ${formatDateTimeNumeric(
-                  this.date,
-                  {
-                    ...defaultLocale,
-                    language: key,
-                    time_format: TimeFormat.twenty_four,
-                  },
-                  demoConfig
-                )}
-              </div>
-            </div>
-          `
-        )}
+            `
+          )}
      </mwc-list>
    `;
  }
--- a/gallery/src/pages/date-time/date-time-seconds.ts
+++ b/gallery/src/pages/date-time/date-time-seconds.ts
@@ -1,20 +1,19 @@
-import "@material/mwc-list/mwc-list";
-import { LitElement, css, html } from "lit";
+import { html, css, LitElement } from "lit";
 import { customElement, state } from "lit/decorators";
-import { formatDateTimeWithSeconds } from "../../../../src/common/datetime/format_date_time";
 import "../../../../src/components/ha-card";
 import "../../../../src/components/ha-control-select";
+import { translationMetadata } from "../../../../src/resources/translations-metadata";
+import { formatDateTimeWithSeconds } from "../../../../src/common/datetime/format_date_time";
+import { timeOptions } from "../../data/date-options";
+import { demoConfig } from "../../../../src/fake_data/demo_config";
 import {
-  DateFormat,
-  FirstWeekday,
  FrontendLocaleData,
  NumberFormat,
  TimeFormat,
+  DateFormat,
+  FirstWeekday,
  TimeZone,
 } from "../../../../src/data/translation";
-import { demoConfig } from "../../../../src/fake_data/demo_config";
-import { translationMetadata } from "../../../../src/resources/translations-metadata";
-import { timeOptions } from "../../data/date-options";

@customElement("demo-date-time-date-time-seconds")
 export class DemoDateTimeDateTimeSeconds extends LitElement {
@@ -56,46 +55,48 @@ export class DemoDateTimeDateTimeSeconds extends LitElement {
          <div class="center">12 Hours</div>
          <div class="center">24 Hours</div>
        </div>
-        ${Object.entries(translationMetadata.translations).map(
-          ([key, value]) => html`
-            <div class="container">
-              <div>${value.nativeName}</div>
-              <div class="center">
-                ${formatDateTimeWithSeconds(
-                  this.date,
-                  {
-                    ...defaultLocale,
-                    language: key,
-                    time_format: TimeFormat.language,
-                  },
-                  demoConfig
-                )}
+        ${Object.entries(translationMetadata.translations)
+          .filter(([key, _]) => key !== "test")
+          .map(
+            ([key, value]) => html`
+              <div class="container">
+                <div>${value.nativeName}</div>
+                <div class="center">
+                  ${formatDateTimeWithSeconds(
+                    this.date,
+                    {
+                      ...defaultLocale,
+                      language: key,
+                      time_format: TimeFormat.language,
+                    },
+                    demoConfig
+                  )}
+                </div>
+                <div class="center">
+                  ${formatDateTimeWithSeconds(
+                    this.date,
+                    {
+                      ...defaultLocale,
+                      language: key,
+                      time_format: TimeFormat.am_pm,
+                    },
+                    demoConfig
+                  )}
+                </div>
+                <div class="center">
+                  ${formatDateTimeWithSeconds(
+                    this.date,
+                    {
+                      ...defaultLocale,
+                      language: key,
+                      time_format: TimeFormat.twenty_four,
+                    },
+                    demoConfig
+                  )}
+                </div>
              </div>
-              <div class="center">
-                ${formatDateTimeWithSeconds(
-                  this.date,
-                  {
-                    ...defaultLocale,
-                    language: key,
-                    time_format: TimeFormat.am_pm,
-                  },
-                  demoConfig
-                )}
-              </div>
-              <div class="center">
-                ${formatDateTimeWithSeconds(
-                  this.date,
-                  {
-                    ...defaultLocale,
-                    language: key,
-                    time_format: TimeFormat.twenty_four,
-                  },
-                  demoConfig
-                )}
-              </div>
-            </div>
-          `
-        )}
+            `
+          )}
      </mwc-list>
    `;
  }
--- a/gallery/src/pages/date-time/date-time-short-year.ts
+++ b/gallery/src/pages/date-time/date-time-short-year.ts
@@ -1,20 +1,19 @@
-import "@material/mwc-list/mwc-list";
-import { LitElement, css, html } from "lit";
+import { html, css, LitElement } from "lit";
 import { customElement, state } from "lit/decorators";
-import { formatShortDateTimeWithYear } from "../../../../src/common/datetime/format_date_time";
 import "../../../../src/components/ha-card";
 import "../../../../src/components/ha-control-select";
+import { translationMetadata } from "../../../../src/resources/translations-metadata";
+import { formatShortDateTimeWithYear } from "../../../../src/common/datetime/format_date_time";
+import { timeOptions } from "../../data/date-options";
+import { demoConfig } from "../../../../src/fake_data/demo_config";
 import {
-  DateFormat,
-  FirstWeekday,
  FrontendLocaleData,
  NumberFormat,
  TimeFormat,
+  DateFormat,
+  FirstWeekday,
  TimeZone,
 } from "../../../../src/data/translation";
-import { demoConfig } from "../../../../src/fake_data/demo_config";
-import { translationMetadata } from "../../../../src/resources/translations-metadata";
-import { timeOptions } from "../../data/date-options";

@customElement("demo-date-time-date-time-short-year")
 export class DemoDateTimeDateTimeShortYear extends LitElement {
@@ -56,46 +55,48 @@ export class DemoDateTimeDateTimeShortYear extends LitElement {
          <div class="center">12 Hours</div>
          <div class="center">24 Hours</div>
        </div>
-        ${Object.entries(translationMetadata.translations).map(
-          ([key, value]) => html`
-            <div class="container">
-              <div>${value.nativeName}</div>
-              <div class="center">
-                ${formatShortDateTimeWithYear(
-                  this.date,
-                  {
-                    ...defaultLocale,
-                    language: key,
-                    time_format: TimeFormat.language,
-                  },
-                  demoConfig
-                )}
+        ${Object.entries(translationMetadata.translations)
+          .filter(([key, _]) => key !== "test")
+          .map(
+            ([key, value]) => html`
+              <div class="container">
+                <div>${value.nativeName}</div>
+                <div class="center">
+                  ${formatShortDateTimeWithYear(
+                    this.date,
+                    {
+                      ...defaultLocale,
+                      language: key,
+                      time_format: TimeFormat.language,
+                    },
+                    demoConfig
+                  )}
+                </div>
+                <div class="center">
+                  ${formatShortDateTimeWithYear(
+                    this.date,
+                    {
+                      ...defaultLocale,
+                      language: key,
+                      time_format: TimeFormat.am_pm,
+                    },
+                    demoConfig
+                  )}
+                </div>
+                <div class="center">
+                  ${formatShortDateTimeWithYear(
+                    this.date,
+                    {
+                      ...defaultLocale,
+                      language: key,
+                      time_format: TimeFormat.twenty_four,
+                    },
+                    demoConfig
+                  )}
+                </div>
              </div>
-              <div class="center">
-                ${formatShortDateTimeWithYear(
-                  this.date,
-                  {
-                    ...defaultLocale,
-                    language: key,
-                    time_format: TimeFormat.am_pm,
-                  },
-                  demoConfig
-                )}
-              </div>
-              <div class="center">
-                ${formatShortDateTimeWithYear(
-                  this.date,
-                  {
-                    ...defaultLocale,
-                    language: key,
-                    time_format: TimeFormat.twenty_four,
-                  },
-                  demoConfig
-                )}
-              </div>
-            </div>
-          `
-        )}
+            `
+          )}
      </mwc-list>
    `;
  }
--- a/gallery/src/pages/date-time/date-time-short.ts
+++ b/gallery/src/pages/date-time/date-time-short.ts
@@ -1,20 +1,19 @@
-import "@material/mwc-list/mwc-list";
-import { LitElement, css, html } from "lit";
+import { html, css, LitElement } from "lit";
 import { customElement, state } from "lit/decorators";
-import { formatShortDateTime } from "../../../../src/common/datetime/format_date_time";
 import "../../../../src/components/ha-card";
 import "../../../../src/components/ha-control-select";
+import { translationMetadata } from "../../../../src/resources/translations-metadata";
+import { formatShortDateTime } from "../../../../src/common/datetime/format_date_time";
+import { timeOptions } from "../../data/date-options";
+import { demoConfig } from "../../../../src/fake_data/demo_config";
 import {
-  DateFormat,
-  FirstWeekday,
  FrontendLocaleData,
  NumberFormat,
  TimeFormat,
+  DateFormat,
+  FirstWeekday,
  TimeZone,
 } from "../../../../src/data/translation";
-import { demoConfig } from "../../../../src/fake_data/demo_config";
-import { translationMetadata } from "../../../../src/resources/translations-metadata";
-import { timeOptions } from "../../data/date-options";

@customElement("demo-date-time-date-time-short")
 export class DemoDateTimeDateTimeShort extends LitElement {
@@ -56,46 +55,48 @@ export class DemoDateTimeDateTimeShort extends LitElement {
          <div class="center">12 Hours</div>
          <div class="center">24 Hours</div>
        </div>
-        ${Object.entries(translationMetadata.translations).map(
-          ([key, value]) => html`
-            <div class="container">
-              <div>${value.nativeName}</div>
-              <div class="center">
-                ${formatShortDateTime(
-                  this.date,
-                  {
-                    ...defaultLocale,
-                    language: key,
-                    time_format: TimeFormat.language,
-                  },
-                  demoConfig
-                )}
+        ${Object.entries(translationMetadata.translations)
+          .filter(([key, _]) => key !== "test")
+          .map(
+            ([key, value]) => html`
+              <div class="container">
+                <div>${value.nativeName}</div>
+                <div class="center">
+                  ${formatShortDateTime(
+                    this.date,
+                    {
+                      ...defaultLocale,
+                      language: key,
+                      time_format: TimeFormat.language,
+                    },
+                    demoConfig
+                  )}
+                </div>
+                <div class="center">
+                  ${formatShortDateTime(
+                    this.date,
+                    {
+                      ...defaultLocale,
+                      language: key,
+                      time_format: TimeFormat.am_pm,
+                    },
+                    demoConfig
+                  )}
+                </div>
+                <div class="center">
+                  ${formatShortDateTime(
+                    this.date,
+                    {
+                      ...defaultLocale,
+                      language: key,
+                      time_format: TimeFormat.twenty_four,
+                    },
+                    demoConfig
+                  )}
+                </div>
              </div>
-              <div class="center">
-                ${formatShortDateTime(
-                  this.date,
-                  {
-                    ...defaultLocale,
-                    language: key,
-                    time_format: TimeFormat.am_pm,
-                  },
-                  demoConfig
-                )}
-              </div>
-              <div class="center">
-                ${formatShortDateTime(
-                  this.date,
-                  {
-                    ...defaultLocale,
-                    language: key,
-                    time_format: TimeFormat.twenty_four,
-                  },
-                  demoConfig
-                )}
-              </div>
-            </div>
-          `
-        )}
+            `
+          )}
      </mwc-list>
    `;
  }
--- a/gallery/src/pages/date-time/date-time.ts
+++ b/gallery/src/pages/date-time/date-time.ts
@@ -1,20 +1,19 @@
-import "@material/mwc-list/mwc-list";
-import { LitElement, css, html } from "lit";
+import { html, css, LitElement } from "lit";
 import { customElement, state } from "lit/decorators";
-import { formatDateTime } from "../../../../src/common/datetime/format_date_time";
 import "../../../../src/components/ha-card";
 import "../../../../src/components/ha-control-select";
+import { translationMetadata } from "../../../../src/resources/translations-metadata";
+import { formatDateTime } from "../../../../src/common/datetime/format_date_time";
+import { timeOptions } from "../../data/date-options";
+import { demoConfig } from "../../../../src/fake_data/demo_config";
 import {
-  DateFormat,
-  FirstWeekday,
  FrontendLocaleData,
  NumberFormat,
  TimeFormat,
+  DateFormat,
+  FirstWeekday,
  TimeZone,
 } from "../../../../src/data/translation";
-import { demoConfig } from "../../../../src/fake_data/demo_config";
-import { translationMetadata } from "../../../../src/resources/translations-metadata";
-import { timeOptions } from "../../data/date-options";

@customElement("demo-date-time-date-time")
 export class DemoDateTimeDateTime extends LitElement {
@@ -56,46 +55,48 @@ export class DemoDateTimeDateTime extends LitElement {
          <div class="center">12 Hours</div>
          <div class="center">24 Hours</div>
        </div>
-        ${Object.entries(translationMetadata.translations).map(
-          ([key, value]) => html`
-            <div class="container">
-              <div>${value.nativeName}</div>
-              <div class="center">
-                ${formatDateTime(
-                  this.date,
-                  {
-                    ...defaultLocale,
-                    language: key,
-                    time_format: TimeFormat.language,
-                  },
-                  demoConfig
-                )}
+        ${Object.entries(translationMetadata.translations)
+          .filter(([key, _]) => key !== "test")
+          .map(
+            ([key, value]) => html`
+              <div class="container">
+                <div>${value.nativeName}</div>
+                <div class="center">
+                  ${formatDateTime(
+                    this.date,
+                    {
+                      ...defaultLocale,
+                      language: key,
+                      time_format: TimeFormat.language,
+                    },
+                    demoConfig
+                  )}
+                </div>
+                <div class="center">
+                  ${formatDateTime(
+                    this.date,
+                    {
+                      ...defaultLocale,
+                      language: key,
+                      time_format: TimeFormat.am_pm,
+                    },
+                    demoConfig
+                  )}
+                </div>
+                <div class="center">
+                  ${formatDateTime(
+                    this.date,
+                    {
+                      ...defaultLocale,
+                      language: key,
+                      time_format: TimeFormat.twenty_four,
+                    },
+                    demoConfig
+                  )}
+                </div>
              </div>
-              <div class="center">
-                ${formatDateTime(
-                  this.date,
-                  {
-                    ...defaultLocale,
-                    language: key,
-                    time_format: TimeFormat.am_pm,
-                  },
-                  demoConfig
-                )}
-              </div>
-              <div class="center">
-                ${formatDateTime(
-                  this.date,
-                  {
-                    ...defaultLocale,
-                    language: key,
-                    time_format: TimeFormat.twenty_four,
-                  },
-                  demoConfig
-                )}
-              </div>
-            </div>
-          `
-        )}
+            `
+          )}
      </mwc-list>
    `;
  }
--- a/gallery/src/pages/date-time/date.ts
+++ b/gallery/src/pages/date-time/date.ts
@@ -35,57 +35,59 @@ export class DemoDateTimeDate extends LitElement {
          <div class="center">Month-Day-Year</div>
          <div class="center">Year-Month-Day</div>
        </div>
-        ${Object.entries(translationMetadata.translations).map(
-          ([key, value]) => html`
-            <div class="container">
-              <div>${value.nativeName}</div>
-              <div class="center">
-                ${formatDateNumeric(
-                  date,
-                  {
-                    ...defaultLocale,
-                    language: key,
-                    date_format: DateFormat.language,
-                  },
-                  demoConfig
-                )}
+        ${Object.entries(translationMetadata.translations)
+          .filter(([key, _]) => key !== "test")
+          .map(
+            ([key, value]) => html`
+              <div class="container">
+                <div>${value.nativeName}</div>
+                <div class="center">
+                  ${formatDateNumeric(
+                    date,
+                    {
+                      ...defaultLocale,
+                      language: key,
+                      date_format: DateFormat.language,
+                    },
+                    demoConfig
+                  )}
+                </div>
+                <div class="center">
+                  ${formatDateNumeric(
+                    date,
+                    {
+                      ...defaultLocale,
+                      language: key,
+                      date_format: DateFormat.DMY,
+                    },
+                    demoConfig
+                  )}
+                </div>
+                <div class="center">
+                  ${formatDateNumeric(
+                    date,
+                    {
+                      ...defaultLocale,
+                      language: key,
+                      date_format: DateFormat.MDY,
+                    },
+                    demoConfig
+                  )}
+                </div>
+                <div class="center">
+                  ${formatDateNumeric(
+                    date,
+                    {
+                      ...defaultLocale,
+                      language: key,
+                      date_format: DateFormat.YMD,
+                    },
+                    demoConfig
+                  )}
+                </div>
              </div>
-              <div class="center">
-                ${formatDateNumeric(
-                  date,
-                  {
-                    ...defaultLocale,
-                    language: key,
-                    date_format: DateFormat.DMY,
-                  },
-                  demoConfig
-                )}
-              </div>
-              <div class="center">
-                ${formatDateNumeric(
-                  date,
-                  {
-                    ...defaultLocale,
-                    language: key,
-                    date_format: DateFormat.MDY,
-                  },
-                  demoConfig
-                )}
-              </div>
-              <div class="center">
-                ${formatDateNumeric(
-                  date,
-                  {
-                    ...defaultLocale,
-                    language: key,
-                    date_format: DateFormat.YMD,
-                  },
-                  demoConfig
-                )}
-              </div>
-            </div>
-          `
-        )}
+            `
+          )}
      </mwc-list>
    `;
  }
--- a/gallery/src/pages/date-time/time-seconds.ts
+++ b/gallery/src/pages/date-time/time-seconds.ts
@@ -1,20 +1,18 @@
-import "@material/mwc-list/mwc-list";
-import { LitElement, css, html } from "lit";
+import { html, css, LitElement } from "lit";
 import { customElement, state } from "lit/decorators";
-import { formatTimeWithSeconds } from "../../../../src/common/datetime/format_time";
 import "../../../../src/components/ha-card";
-import "../../../../src/components/ha-control-select";
+import { translationMetadata } from "../../../../src/resources/translations-metadata";
+import { formatTimeWithSeconds } from "../../../../src/common/datetime/format_time";
+import { timeOptions } from "../../data/date-options";
+import { demoConfig } from "../../../../src/fake_data/demo_config";
 import {
-  DateFormat,
-  FirstWeekday,
  FrontendLocaleData,
  NumberFormat,
  TimeFormat,
+  DateFormat,
+  FirstWeekday,
  TimeZone,
 } from "../../../../src/data/translation";
-import { demoConfig } from "../../../../src/fake_data/demo_config";
-import { translationMetadata } from "../../../../src/resources/translations-metadata";
-import { timeOptions } from "../../data/date-options";

@customElement("demo-date-time-time-seconds")
 export class DemoDateTimeTimeSeconds extends LitElement {
@@ -56,46 +54,48 @@ export class DemoDateTimeTimeSeconds extends LitElement {
          <div class="center">12 Hours</div>
          <div class="center">24 Hours</div>
        </div>
-        ${Object.entries(translationMetadata.translations).map(
-          ([key, value]) => html`
-            <div class="container">
-              <div>${value.nativeName}</div>
-              <div class="center">
-                ${formatTimeWithSeconds(
-                  this.date,
-                  {
-                    ...defaultLocale,
-                    language: key,
-                    time_format: TimeFormat.language,
-                  },
-                  demoConfig
-                )}
+        ${Object.entries(translationMetadata.translations)
+          .filter(([key, _]) => key !== "test")
+          .map(
+            ([key, value]) => html`
+              <div class="container">
+                <div>${value.nativeName}</div>
+                <div class="center">
+                  ${formatTimeWithSeconds(
+                    this.date,
+                    {
+                      ...defaultLocale,
+                      language: key,
+                      time_format: TimeFormat.language,
+                    },
+                    demoConfig
+                  )}
+                </div>
+                <div class="center">
+                  ${formatTimeWithSeconds(
+                    this.date,
+                    {
+                      ...defaultLocale,
+                      language: key,
+                      time_format: TimeFormat.am_pm,
+                    },
+                    demoConfig
+                  )}
+                </div>
+                <div class="center">
+                  ${formatTimeWithSeconds(
+                    this.date,
+                    {
+                      ...defaultLocale,
+                      language: key,
+                      time_format: TimeFormat.twenty_four,
+                    },
+                    demoConfig
+                  )}
+                </div>
              </div>
-              <div class="center">
-                ${formatTimeWithSeconds(
-                  this.date,
-                  {
-                    ...defaultLocale,
-                    language: key,
-                    time_format: TimeFormat.am_pm,
-                  },
-                  demoConfig
-                )}
-              </div>
-              <div class="center">
-                ${formatTimeWithSeconds(
-                  this.date,
-                  {
-                    ...defaultLocale,
-                    language: key,
-                    time_format: TimeFormat.twenty_four,
-                  },
-                  demoConfig
-                )}
-              </div>
-            </div>
-          `
-        )}
+            `
+          )}
      </mwc-list>
    `;
  }
--- a/gallery/src/pages/date-time/time-weekday.ts
+++ b/gallery/src/pages/date-time/time-weekday.ts
@@ -1,20 +1,18 @@
-import "@material/mwc-list/mwc-list";
-import { LitElement, css, html } from "lit";
+import { html, css, LitElement } from "lit";
 import { customElement, state } from "lit/decorators";
-import { formatTimeWeekday } from "../../../../src/common/datetime/format_time";
 import "../../../../src/components/ha-card";
-import "../../../../src/components/ha-control-select";
+import { translationMetadata } from "../../../../src/resources/translations-metadata";
+import { formatTimeWeekday } from "../../../../src/common/datetime/format_time";
+import { timeOptions } from "../../data/date-options";
+import { demoConfig } from "../../../../src/fake_data/demo_config";
 import {
-  DateFormat,
-  FirstWeekday,
  FrontendLocaleData,
  NumberFormat,
  TimeFormat,
+  DateFormat,
+  FirstWeekday,
  TimeZone,
 } from "../../../../src/data/translation";
-import { demoConfig } from "../../../../src/fake_data/demo_config";
-import { translationMetadata } from "../../../../src/resources/translations-metadata";
-import { timeOptions } from "../../data/date-options";

@customElement("demo-date-time-time-weekday")
 export class DemoDateTimeTimeWeekday extends LitElement {
@@ -56,46 +54,48 @@ export class DemoDateTimeTimeWeekday extends LitElement {
          <div class="center">12 Hours</div>
          <div class="center">24 Hours</div>
        </div>
-        ${Object.entries(translationMetadata.translations).map(
-          ([key, value]) => html`
-            <div class="container">
-              <div>${value.nativeName}</div>
-              <div class="center">
-                ${formatTimeWeekday(
-                  this.date,
-                  {
-                    ...defaultLocale,
-                    language: key,
-                    time_format: TimeFormat.language,
-                  },
-                  demoConfig
-                )}
+        ${Object.entries(translationMetadata.translations)
+          .filter(([key, _]) => key !== "test")
+          .map(
+            ([key, value]) => html`
+              <div class="container">
+                <div>${value.nativeName}</div>
+                <div class="center">
+                  ${formatTimeWeekday(
+                    this.date,
+                    {
+                      ...defaultLocale,
+                      language: key,
+                      time_format: TimeFormat.language,
+                    },
+                    demoConfig
+                  )}
+                </div>
+                <div class="center">
+                  ${formatTimeWeekday(
+                    this.date,
+                    {
+                      ...defaultLocale,
+                      language: key,
+                      time_format: TimeFormat.am_pm,
+                    },
+                    demoConfig
+                  )}
+                </div>
+                <div class="center">
+                  ${formatTimeWeekday(
+                    this.date,
+                    {
+                      ...defaultLocale,
+                      language: key,
+                      time_format: TimeFormat.twenty_four,
+                    },
+                    demoConfig
+                  )}
+                </div>
              </div>
-              <div class="center">
-                ${formatTimeWeekday(
-                  this.date,
-                  {
-                    ...defaultLocale,
-                    language: key,
-                    time_format: TimeFormat.am_pm,
-                  },
-                  demoConfig
-                )}
-              </div>
-              <div class="center">
-                ${formatTimeWeekday(
-                  this.date,
-                  {
-                    ...defaultLocale,
-                    language: key,
-                    time_format: TimeFormat.twenty_four,
-                  },
-                  demoConfig
-                )}
-              </div>
-            </div>
-          `
-        )}
+            `
+          )}
      </mwc-list>
    `;
  }
--- a/gallery/src/pages/date-time/time.ts
+++ b/gallery/src/pages/date-time/time.ts
@@ -1,20 +1,19 @@
-import "@material/mwc-list/mwc-list";
-import { LitElement, css, html } from "lit";
+import { html, css, LitElement } from "lit";
 import { customElement, state } from "lit/decorators";
-import { formatTime } from "../../../../src/common/datetime/format_time";
 import "../../../../src/components/ha-card";
 import "../../../../src/components/ha-control-select";
+import { translationMetadata } from "../../../../src/resources/translations-metadata";
+import { formatTime } from "../../../../src/common/datetime/format_time";
+import { timeOptions } from "../../data/date-options";
+import { demoConfig } from "../../../../src/fake_data/demo_config";
 import {
-  DateFormat,
-  FirstWeekday,
  FrontendLocaleData,
  NumberFormat,
  TimeFormat,
+  DateFormat,
+  FirstWeekday,
  TimeZone,
 } from "../../../../src/data/translation";
-import { demoConfig } from "../../../../src/fake_data/demo_config";
-import { translationMetadata } from "../../../../src/resources/translations-metadata";
-import { timeOptions } from "../../data/date-options";

@customElement("demo-date-time-time")
 export class DemoDateTimeTime extends LitElement {
@@ -56,46 +55,48 @@ export class DemoDateTimeTime extends LitElement {
          <div class="center">12 Hours</div>
          <div class="center">24 Hours</div>
        </div>
-        ${Object.entries(translationMetadata.translations).map(
-          ([key, value]) => html`
-            <div class="container">
-              <div>${value.nativeName}</div>
-              <div class="center">
-                ${formatTime(
-                  this.date,
-                  {
-                    ...defaultLocale,
-                    language: key,
-                    time_format: TimeFormat.language,
-                  },
-                  demoConfig
-                )}
+        ${Object.entries(translationMetadata.translations)
+          .filter(([key, _]) => key !== "test")
+          .map(
+            ([key, value]) => html`
+              <div class="container">
+                <div>${value.nativeName}</div>
+                <div class="center">
+                  ${formatTime(
+                    this.date,
+                    {
+                      ...defaultLocale,
+                      language: key,
+                      time_format: TimeFormat.language,
+                    },
+                    demoConfig
+                  )}
+                </div>
+                <div class="center">
+                  ${formatTime(
+                    this.date,
+                    {
+                      ...defaultLocale,
+                      language: key,
+                      time_format: TimeFormat.am_pm,
+                    },
+                    demoConfig
+                  )}
+                </div>
+                <div class="center">
+                  ${formatTime(
+                    this.date,
+                    {
+                      ...defaultLocale,
+                      language: key,
+                      time_format: TimeFormat.twenty_four,
+                    },
+                    demoConfig
+                  )}
+                </div>
              </div>
-              <div class="center">
-                ${formatTime(
-                  this.date,
-                  {
-                    ...defaultLocale,
-                    language: key,
-                    time_format: TimeFormat.am_pm,
-                  },
-                  demoConfig
-                )}
-              </div>
-              <div class="center">
-                ${formatTime(
-                  this.date,
-                  {
-                    ...defaultLocale,
-                    language: key,
-                    time_format: TimeFormat.twenty_four,
-                  },
-                  demoConfig
-                )}
-              </div>
-            </div>
-          `
-        )}
+            `
+          )}
      </mwc-list>
    `;
  }
--- a/gallery/src/pages/lovelace/alarm-panel-card.ts
+++ b/gallery/src/pages/lovelace/alarm-panel-card.ts
@@ -3,7 +3,6 @@ import { customElement, query } from "lit/decorators";
 import { getEntity } from "../../../../src/fake_data/entity";
 import { provideHass } from "../../../../src/fake_data/provide_hass";
 import "../../components/demo-cards";
-import { mockIcons } from "../../../../demo/src/stubs/icons";

 const ENTITIES = [
  getEntity("alarm_control_panel", "alarm", "disarmed", {
@@ -85,7 +84,6 @@ class DemoAlarmPanelEntity extends LitElement {
    hass.updateTranslations(null, "en");
    hass.updateTranslations("lovelace", "en");
    hass.addEntities(ENTITIES);
-    mockIcons(hass);
  }
 }

--- a/gallery/src/pages/lovelace/area-card.ts
+++ b/gallery/src/pages/lovelace/area-card.ts
@@ -3,7 +3,6 @@ import { customElement, query } from "lit/decorators";
 import { getEntity } from "../../../../src/fake_data/entity";
 import { provideHass } from "../../../../src/fake_data/provide_hass";
 import "../../components/demo-cards";
-import { mockIcons } from "../../../../demo/src/stubs/icons";

 const ENTITIES = [
  getEntity("light", "bed_light", "on", {
@@ -147,7 +146,6 @@ class DemoArea extends LitElement {
        entity_id: "binary_sensor.kitchen_door",
      },
    ]);
-    mockIcons(hass);
  }
 }

--- a/gallery/src/pages/lovelace/conditional-card.ts
+++ b/gallery/src/pages/lovelace/conditional-card.ts
@@ -3,7 +3,6 @@ import { customElement, query } from "lit/decorators";
 import { getEntity } from "../../../../src/fake_data/entity";
 import { provideHass } from "../../../../src/fake_data/provide_hass";
 import "../../components/demo-cards";
-import { mockIcons } from "../../../../demo/src/stubs/icons";

 const ENTITIES = [
  getEntity("light", "controller_1", "on", {
@@ -67,7 +66,6 @@ class DemoConditional extends LitElement {
    hass.updateTranslations(null, "en");
    hass.updateTranslations("lovelace", "en");
    hass.addEntities(ENTITIES);
-    mockIcons(hass);
  }
 }

--- a/gallery/src/pages/lovelace/entities-card.ts
+++ b/gallery/src/pages/lovelace/entities-card.ts
@@ -3,7 +3,6 @@ import { customElement, query } from "lit/decorators";
 import { getEntity } from "../../../../src/fake_data/entity";
 import { provideHass } from "../../../../src/fake_data/provide_hass";
 import "../../components/demo-cards";
-import { mockIcons } from "../../../../demo/src/stubs/icons";

 const ENTITIES = [
  getEntity("light", "bed_light", "on", {
@@ -324,7 +323,6 @@ class DemoEntities extends LitElement {
    hass.updateTranslations(null, "en");
    hass.updateTranslations("lovelace", "en");
    hass.addEntities(ENTITIES);
-    mockIcons(hass);
  }
 }

--- a/gallery/src/pages/lovelace/entity-button-card.ts
+++ b/gallery/src/pages/lovelace/entity-button-card.ts
@@ -3,7 +3,6 @@ import { customElement, query } from "lit/decorators";
 import { getEntity } from "../../../../src/fake_data/entity";
 import { provideHass } from "../../../../src/fake_data/provide_hass";
 import "../../components/demo-cards";
-import { mockIcons } from "../../../../demo/src/stubs/icons";

 const ENTITIES = [
  getEntity("light", "bed_light", "on", {
@@ -83,7 +82,6 @@ class DemoButtonEntity extends LitElement {
    hass.updateTranslations(null, "en");
    hass.updateTranslations("lovelace", "en");
    hass.addEntities(ENTITIES);
-    mockIcons(hass);
  }
 }

--- a/gallery/src/pages/lovelace/entity-filter-card.ts
+++ b/gallery/src/pages/lovelace/entity-filter-card.ts
@@ -3,7 +3,6 @@ import { customElement, query } from "lit/decorators";
 import { getEntity } from "../../../../src/fake_data/entity";
 import { provideHass } from "../../../../src/fake_data/provide_hass";
 import "../../components/demo-cards";
-import { mockIcons } from "../../../../demo/src/stubs/icons";

 const ENTITIES = [
  getEntity("device_tracker", "demo_paulus", "work", {
@@ -11,7 +10,7 @@ const ENTITIES = [
    latitude: 32.877105,
    longitude: 117.232185,
    gps_accuracy: 91,
-    battery: 25,
+    battery: 71,
    friendly_name: "Paulus",
  }),
  getEntity("device_tracker", "demo_anne_therese", "school", {
@@ -19,7 +18,7 @@ const ENTITIES = [
    latitude: 32.877105,
    longitude: 117.232185,
    gps_accuracy: 91,
-    battery: 50,
+    battery: 71,
    friendly_name: "Anne Therese",
  }),
  getEntity("device_tracker", "demo_home_boy", "home", {
@@ -27,7 +26,7 @@ const ENTITIES = [
    latitude: 32.877105,
    longitude: 117.232185,
    gps_accuracy: 91,
-    battery: 75,
+    battery: 71,
    friendly_name: "Home Boy",
  }),
  getEntity("light", "bed_light", "on", {
@@ -39,53 +38,21 @@ const ENTITIES = [
  getEntity("light", "ceiling_lights", "off", {
    friendly_name: "Ceiling Lights",
  }),
-  getEntity("sensor", "battery_1", 20, {
-    device_class: "battery",
-    friendly_name: "Battery 1",
-    unit_of_measurement: "%",
-  }),
-  getEntity("sensor", "battery_2", 35, {
-    device_class: "battery",
-    friendly_name: "Battery 2",
-    unit_of_measurement: "%",
-  }),
-  getEntity("sensor", "battery_3", 40, {
-    device_class: "battery",
-    friendly_name: "Battery 3",
-    unit_of_measurement: "%",
-  }),
-  getEntity("sensor", "battery_4", 80, {
-    device_class: "battery",
-    friendly_name: "Battery 4",
-    unit_of_measurement: "%",
-  }),
-  getEntity("input_number", "min_battery_level", 30, {
-    mode: "slider",
-    step: 10,
-    min: 0,
-    max: 100,
-    icon: "mdi:battery-alert-variant",
-    friendly_name: "Minimum Battery Level",
-    unit_of_measurement: "%",
-  }),
 ];

 const CONFIGS = [
  {
-    heading: "Unfiltered entities",
+    heading: "Unfiltered controller",
    config: `
 - type: entities
  entities:
-    - device_tracker.demo_anne_therese
-    - device_tracker.demo_home_boy
-    - device_tracker.demo_paulus
-    - light.bed_light
-    - light.ceiling_lights
-    - light.kitchen_lights
+  - light.bed_light
+  - light.ceiling_lights
+  - light.kitchen_lights
    `,
  },
  {
-    heading: "On and home entities",
+    heading: "Filtered entities card",
    config: `
 - type: entity-filter
  entities:
@@ -95,28 +62,9 @@ const CONFIGS = [
    - light.bed_light
    - light.ceiling_lights
    - light.kitchen_lights
-  conditions:
-    - condition: state
-      state:
-        - "on"
-        - home
-    `,
-  },
-  {
-    heading: "Same state as Bed Light",
-    config: `
- type: entity-filter
-  entities:
-    - device_tracker.demo_anne_therese
-    - device_tracker.demo_home_boy
-    - device_tracker.demo_paulus
-    - light.bed_light
-    - light.ceiling_lights
-    - light.kitchen_lights
-  conditions:
-    - condition: state
-      state:
-        - light.bed_light
+  state_filter:
+    - "on"
+    - home
    `,
  },
  {
@@ -130,11 +78,9 @@ const CONFIGS = [
    - light.bed_light
    - light.ceiling_lights
    - light.kitchen_lights
-  conditions:
-    - condition: state
-      state:
-        - "on"
-        - home
+  state_filter:
+    - "on"
+    - not_home
  card:
    type: entities
    title: Custom Title
@@ -152,101 +98,15 @@ const CONFIGS = [
    - light.bed_light
    - light.ceiling_lights
    - light.kitchen_lights
-  conditions:
-    - condition: state
-      state:
-        - "on"
-        - home
+  state_filter:
+    - "on"
+    - not_home
  card:
    type: glance
    show_state: true
    title: Custom Title
    `,
  },
-  {
-    heading:
-      "Filtered entities by battery attribute (< '30') using state filter",
-    config: `
- type: entity-filter
-  entities:
-    - device_tracker.demo_anne_therese
-    - device_tracker.demo_home_boy
-    - device_tracker.demo_paulus
-  state_filter:
-    - operator: <
-      attribute: battery
-      value: "30"
-    `,
-  },
-  {
-    heading: "Unfiltered number entities",
-    config: `
- type: entities
-  entities:
-    - input_number.min_battery_level
-    - sensor.battery_1
-    - sensor.battery_3
-    - sensor.battery_2
-    - sensor.battery_4
-    `,
-  },
-  {
-    heading: "Battery lower than 50%",
-    config: `
- type: entity-filter
-  entities:
-    - sensor.battery_1
-    - sensor.battery_3
-    - sensor.battery_2
-    - sensor.battery_4
-  conditions:
-    - condition: numeric_state
-      below: 50
-    `,
-  },
-  {
-    heading: "Battery lower than min battery level",
-    config: `
- type: entity-filter
-  entities:
-    - sensor.battery_1
-    - sensor.battery_3
-    - sensor.battery_2
-    - sensor.battery_4
-  conditions:
-    - condition: numeric_state
-      below: input_number.min_battery_level
-    `,
-  },
-  {
-    heading: "Battery between min battery level and 70%",
-    config: `
- type: entity-filter
-  entities:
-    - sensor.battery_1
-    - sensor.battery_3
-    - sensor.battery_2
-    - sensor.battery_4
-  conditions:
-    - condition: numeric_state
-      above: input_number.min_battery_level
-      below: 70
-    `,
-  },
-  {
-    heading: "Error: Entities must be specified",
-    config: `
- type: entity-filter
-    `,
-  },
-  {
-    heading: "Error: Incorrect filter config",
-    config: `
- type: entity-filter
-  entities:
-    - sensor.gas_station_lowest_price
-    `,
-  },
 ];

@customElement("demo-lovelace-entity-filter-card")
@@ -263,7 +123,6 @@ class DemoEntityFilter extends LitElement {
    hass.updateTranslations(null, "en");
    hass.updateTranslations("lovelace", "en");
    hass.addEntities(ENTITIES);
-    mockIcons(hass);
  }
 }

--- a/gallery/src/pages/lovelace/gauge-card.ts
+++ b/gallery/src/pages/lovelace/gauge-card.ts
@@ -3,7 +3,6 @@ import { customElement, query } from "lit/decorators";
 import { getEntity } from "../../../../src/fake_data/entity";
 import { provideHass } from "../../../../src/fake_data/provide_hass";
 import "../../components/demo-cards";
-import { mockIcons } from "../../../../demo/src/stubs/icons";

 const ENTITIES = [
  getEntity("sensor", "brightness", "12", {}),
@@ -129,7 +128,6 @@ class DemoGaugeEntity extends LitElement {
    hass.updateTranslations(null, "en");
    hass.updateTranslations("lovelace", "en");
    hass.addEntities(ENTITIES);
-    mockIcons(hass);
  }
 }

--- a/gallery/src/pages/lovelace/glance-card.ts
+++ b/gallery/src/pages/lovelace/glance-card.ts
@@ -3,7 +3,6 @@ import { customElement, query } from "lit/decorators";
 import { getEntity } from "../../../../src/fake_data/entity";
 import { provideHass } from "../../../../src/fake_data/provide_hass";
 import "../../components/demo-cards";
-import { mockIcons } from "../../../../demo/src/stubs/icons";

 const ENTITIES = [
  getEntity("device_tracker", "demo_paulus", "home", {
@@ -239,7 +238,6 @@ class DemoGlanceEntity extends LitElement {
    hass.updateTranslations(null, "en");
    hass.updateTranslations("lovelace", "en");
    hass.addEntities(ENTITIES);
-    mockIcons(hass);
  }
 }

--- a/gallery/src/pages/lovelace/grid-and-stack-card.ts
+++ b/gallery/src/pages/lovelace/grid-and-stack-card.ts
@@ -4,7 +4,6 @@ import { mockHistory } from "../../../../demo/src/stubs/history";
 import { getEntity } from "../../../../src/fake_data/entity";
 import { provideHass } from "../../../../src/fake_data/provide_hass";
 import "../../components/demo-cards";
-import { mockIcons } from "../../../../demo/src/stubs/icons";

 const ENTITIES = [
  getEntity("light", "kitchen_lights", "on", {
@@ -215,7 +214,6 @@ class DemoStack extends LitElement {
    hass.updateTranslations("lovelace", "en");
    hass.addEntities(ENTITIES);
    mockHistory(hass);
-    mockIcons(hass);
  }
 }

--- a/gallery/src/pages/lovelace/light-card.ts
+++ b/gallery/src/pages/lovelace/light-card.ts
@@ -3,7 +3,6 @@ import { customElement, query } from "lit/decorators";
 import { getEntity } from "../../../../src/fake_data/entity";
 import { provideHass } from "../../../../src/fake_data/provide_hass";
 import "../../components/demo-cards";
-import { mockIcons } from "../../../../demo/src/stubs/icons";

 const ENTITIES = [
  getEntity("light", "bed_light", "on", {
@@ -77,7 +76,6 @@ class DemoLightEntity extends LitElement {
    hass.updateTranslations(null, "en");
    hass.updateTranslations("lovelace", "en");
    hass.addEntities(ENTITIES);
-    mockIcons(hass);
  }
 }

--- a/gallery/src/pages/lovelace/markdown-card.ts
+++ b/gallery/src/pages/lovelace/markdown-card.ts
@@ -65,23 +65,15 @@ const CONFIGS = [
    >> ...by using additional greater-than signs right next to each other...
    > > > ...or with spaces between arrows.

-    > [!NOTE]
-    > This is a GitHub note alert
+    > **Warning** Hey there
+    > This is a warning with a title

-    > [!TIP]
-    > This is a GitHub tip alert
+    > **Note**
+    > This is a note

-    > [!IMPORTANT]
-    > This is a GitHub important alert
-
-    > [!WARNING]
-    > This is a GitHub warning alert
-
-    > [!CAUTION]
-    > This is a GitHub caution alert
-
-    > [!TIP]
-    > - This is a list entry in GitHub tip alert
+    > **Note**
+    > This is a multiline note
+    > Lorem ipsum...

    ## Lists

--- a/gallery/src/pages/lovelace/media-player-row.ts
+++ b/gallery/src/pages/lovelace/media-player-row.ts
@@ -55,7 +55,7 @@ const CONFIGS = [
 ];

@customElement("demo-lovelace-media-player-row")
-export class DemoLovelaceMediaPlayerRow extends LitElement {
+class DemoHuiMediaPlayerRow extends LitElement {
  @query("#demos") private _demoRoot!: HTMLElement;

  protected render(): TemplateResult {
@@ -73,6 +73,6 @@ export class DemoLovelaceMediaPlayerRow extends LitElement {

 declare global {
  interface HTMLElementTagNameMap {
-    "demo-lovelace-media-player-row": DemoLovelaceMediaPlayerRow;
+    "demo-lovelace-media-player-rows": DemoHuiMediaPlayerRow;
  }
 }
--- a/gallery/src/pages/lovelace/picture-elements-card.ts
+++ b/gallery/src/pages/lovelace/picture-elements-card.ts
@@ -3,7 +3,6 @@ import { customElement, query } from "lit/decorators";
 import { getEntity } from "../../../../src/fake_data/entity";
 import { provideHass } from "../../../../src/fake_data/provide_hass";
 import "../../components/demo-cards";
-import { mockIcons } from "../../../../demo/src/stubs/icons";

 const ENTITIES = [
  getEntity("light", "bed_light", "on", {
@@ -139,7 +138,6 @@ class DemoPictureElements extends LitElement {
    hass.updateTranslations(null, "en");
    hass.updateTranslations("lovelace", "en");
    hass.addEntities(ENTITIES);
-    mockIcons(hass);
  }
 }

--- a/Show More
+++ b/Show More