diff --git a/src/components/ha-demo-badge.js b/src/components/ha-demo-badge.js
deleted file mode 100644
index 744562a613..0000000000
--- a/src/components/ha-demo-badge.js
+++ /dev/null
@@ -1,24 +0,0 @@
-import { html } from "@polymer/polymer/lib/utils/html-tag";
-/* eslint-plugin-disable lit */
-import { PolymerElement } from "@polymer/polymer/polymer-element";
-import "./ha-label-badge";
-
-class HaDemoBadge extends PolymerElement {
-  static get template() {
-    return html`
-      <style>
-        :host {
-          --ha-label-badge-color: #dac90d;
-        }
-      </style>
-
-      <ha-label-badge
-        icon="hass:emoticon"
-        label="Demo"
-        description=""
-      ></ha-label-badge>
-    `;
-  }
-}
-
-customElements.define("ha-demo-badge", HaDemoBadge);
diff --git a/src/components/ha-sidebar.ts b/src/components/ha-sidebar.ts
index 70c2806800..5b02f1896c 100644
--- a/src/components/ha-sidebar.ts
+++ b/src/components/ha-sidebar.ts
@@ -6,7 +6,6 @@ import {
   mdiMenu,
   mdiViewDashboard,
 } from "@mdi/js";
-import "@polymer/app-layout/app-toolbar/app-toolbar";
 import "@polymer/paper-item/paper-icon-item";
 import type { PaperIconItemElement } from "@polymer/paper-item/paper-icon-item";
 import "@polymer/paper-item/paper-item";
@@ -16,6 +15,7 @@ import {
   CSSResult,
   eventOptions,
   html,
+  customElement,
   LitElement,
   property,
   PropertyValues,
@@ -109,9 +109,7 @@ const computePanels = (hass: HomeAssistant): [PanelInfo[], PanelInfo[]] => {
   return [beforeSpacer, afterSpacer];
 };
 
-/*
- * @appliesMixin LocalizeMixin
- */
+@customElement("ha-sidebar")
 class HaSidebar extends LitElement {
   @property() public hass!: HomeAssistant;
 
@@ -749,5 +747,3 @@ declare global {
     "ha-sidebar": HaSidebar;
   }
 }
-
-customElements.define("ha-sidebar", HaSidebar);
diff --git a/src/layouts/home-assistant-main.ts b/src/layouts/home-assistant-main.ts
index 9959397dca..7caed9a7ee 100644
--- a/src/layouts/home-assistant-main.ts
+++ b/src/layouts/home-assistant-main.ts
@@ -9,6 +9,7 @@ import {
   html,
   LitElement,
   property,
+  customElement,
   PropertyValues,
   TemplateResult,
 } from "lit-element";
@@ -29,6 +30,7 @@ declare global {
   }
 }
 
+@customElement("home-assistant-main")
 class HomeAssistantMain extends LitElement {
   @property() public hass!: HomeAssistant;
 
@@ -170,4 +172,8 @@ class HomeAssistantMain extends LitElement {
   }
 }
 
-customElements.define("home-assistant-main", HomeAssistantMain);
+declare global {
+  interface HTMLElementTagNameMap {
+    "home-assistant-main": HomeAssistantMain;
+  }
+}
diff --git a/src/layouts/home-assistant.ts b/src/layouts/home-assistant.ts
index 3e4f551fff..61a1d365a8 100644
--- a/src/layouts/home-assistant.ts
+++ b/src/layouts/home-assistant.ts
@@ -1,5 +1,5 @@
 import "@polymer/app-route/app-location";
-import { html, property, PropertyValues } from "lit-element";
+import { html, property, PropertyValues, customElement } from "lit-element";
 import { navigate } from "../common/navigate";
 import { getStorageDefaultPanelUrlPath } from "../data/panel";
 import "../resources/custom-card-support";
@@ -12,6 +12,7 @@ import {
 import "./ha-init-page";
 import "./home-assistant-main";
 
+@customElement("home-assistant")
 export class HomeAssistantAppEl extends HassElement {
   @property() private _route?: Route;
 
@@ -138,4 +139,8 @@ export class HomeAssistantAppEl extends HassElement {
   }
 }
 
-customElements.define("home-assistant", HomeAssistantAppEl);
+declare global {
+  interface HTMLElementTagNameMap {
+    "home-assistant": HomeAssistantAppEl;
+  }
+}
diff --git a/src/panels/config/entities/show-dialog-entity-editor.ts b/src/panels/config/entities/show-dialog-entity-editor.ts
index a45d1e68e0..868bcdd902 100644
--- a/src/panels/config/entities/show-dialog-entity-editor.ts
+++ b/src/panels/config/entities/show-dialog-entity-editor.ts
@@ -1,6 +1,6 @@
 import { fireEvent } from "../../../common/dom/fire_event";
 import { EntityRegistryEntry } from "../../../data/entity_registry";
-import { DialogEntityEditor } from "./dialog-entity-editor";
+import type { DialogEntityEditor } from "./dialog-entity-editor";
 
 export interface EntityRegistryDetailDialogParams {
   entry?: EntityRegistryEntry;