diff --git a/cast/src/launcher/layout/hc-cast.ts b/cast/src/launcher/layout/hc-cast.ts
index 69fbabcecd..2f2cea6576 100644
--- a/cast/src/launcher/layout/hc-cast.ts
+++ b/cast/src/launcher/layout/hc-cast.ts
@@ -32,6 +32,7 @@ import {
 import "../../../../src/layouts/loading-screen";
 import { generateDefaultViewConfig } from "../../../../src/panels/lovelace/common/generate-lovelace-config";
 import "./hc-layout";
+import "@material/mwc-button/mwc-button";
 
 @customElement("hc-cast")
 class HcCast extends LitElement {
diff --git a/hassio/src/addon-view/hassio-addon-view.ts b/hassio/src/addon-view/hassio-addon-view.ts
index 50dff7aa21..a26c31b416 100644
--- a/hassio/src/addon-view/hassio-addon-view.ts
+++ b/hassio/src/addon-view/hassio-addon-view.ts
@@ -24,6 +24,7 @@ import "./hassio-addon-config";
 import "./hassio-addon-info";
 import "./hassio-addon-logs";
 import "./hassio-addon-network";
+import "../../../src/layouts/hass-subpage";
 
 @customElement("hassio-addon-view")
 class HassioAddonView extends LitElement {
diff --git a/hassio/src/snapshots/hassio-snapshots.ts b/hassio/src/snapshots/hassio-snapshots.ts
index 529f9abb8d..dac771dc3d 100644
--- a/hassio/src/snapshots/hassio-snapshots.ts
+++ b/hassio/src/snapshots/hassio-snapshots.ts
@@ -132,7 +132,7 @@ class HassioSnapshots extends LitElement {
                       (addon, idx) => html`
                         <paper-checkbox
                           .idx=${idx}
-                          .checked="{{item.checked}}"
+                          .checked=${addon.checked}
                           @checked-changed=${this._addonChecked}
                         >
                           ${addon.name}
@@ -202,7 +202,6 @@ class HassioSnapshots extends LitElement {
                         .icon=${snapshot.type === "full"
                           ? "hassio:package-variant-closed"
                           : "hassio:package-variant"}
-                        .
                         .icon-class="snapshot"
                       ></hassio-card-content>
                     </div>
diff --git a/src/common/entity/compute_state_display.ts b/src/common/entity/compute_state_display.ts
index 06d748a275..2aa00a2415 100644
--- a/src/common/entity/compute_state_display.ts
+++ b/src/common/entity/compute_state_display.ts
@@ -1,11 +1,11 @@
 import { HassEntity } from "home-assistant-js-websocket";
+import { UNAVAILABLE, UNKNOWN } from "../../data/entity";
+import { atLeastCachedVersion } from "../config/version";
 import { formatDate } from "../datetime/format_date";
 import { formatDateTime } from "../datetime/format_date_time";
 import { formatTime } from "../datetime/format_time";
 import { LocalizeFunc } from "../translations/localize";
 import { computeStateDomain } from "./compute_state_domain";
-import { UNKNOWN, UNAVAILABLE } from "../../data/entity";
-import { atLeastCachedVersion } from "../config/version";
 
 const legacyComputeStateDisplay = (
   localize: LocalizeFunc,
diff --git a/src/components/device/ha-area-devices-picker.ts b/src/components/device/ha-area-devices-picker.ts
index 45145d966b..907d1ec974 100644
--- a/src/components/device/ha-area-devices-picker.ts
+++ b/src/components/device/ha-area-devices-picker.ts
@@ -1,3 +1,5 @@
+import "@material/mwc-button/mwc-button";
+import "@polymer/paper-icon-button/paper-icon-button";
 import "@polymer/paper-input/paper-input";
 import "@polymer/paper-item/paper-item";
 import "@polymer/paper-item/paper-item-body";
diff --git a/src/components/device/ha-device-picker.ts b/src/components/device/ha-device-picker.ts
index a0d52389e7..6d655dc6f1 100644
--- a/src/components/device/ha-device-picker.ts
+++ b/src/components/device/ha-device-picker.ts
@@ -1,3 +1,4 @@
+import "@polymer/paper-icon-button/paper-icon-button";
 import "@polymer/paper-input/paper-input";
 import "@polymer/paper-item/paper-item";
 import "@polymer/paper-item/paper-item-body";
diff --git a/src/components/entity/ha-entity-picker.ts b/src/components/entity/ha-entity-picker.ts
index d5960b3cc0..3451b7f00f 100644
--- a/src/components/entity/ha-entity-picker.ts
+++ b/src/components/entity/ha-entity-picker.ts
@@ -11,8 +11,8 @@ import {
   LitElement,
   property,
   PropertyValues,
-  TemplateResult,
   query,
+  TemplateResult,
 } from "lit-element";
 import memoizeOne from "memoize-one";
 import { fireEvent } from "../../common/dom/fire_event";
diff --git a/src/components/entity/ha-state-label-badge.ts b/src/components/entity/ha-state-label-badge.ts
index b268b89ebc..1761191504 100644
--- a/src/components/entity/ha-state-label-badge.ts
+++ b/src/components/entity/ha-state-label-badge.ts
@@ -11,6 +11,7 @@ import {
 } from "lit-element";
 import { classMap } from "lit-html/directives/class-map";
 import secondsToDuration from "../../common/datetime/seconds_to_duration";
+import { computeStateDisplay } from "../../common/entity/compute_state_display";
 import { computeStateDomain } from "../../common/entity/compute_state_domain";
 import { computeStateName } from "../../common/entity/compute_state_name";
 import { domainIcon } from "../../common/entity/domain_icon";
@@ -18,7 +19,6 @@ import { stateIcon } from "../../common/entity/state_icon";
 import { timerTimeRemaining } from "../../common/entity/timer_time_remaining";
 import { HomeAssistant } from "../../types";
 import "../ha-label-badge";
-import { computeStateDisplay } from "../../common/entity/compute_state_display";
 
 @customElement("ha-state-label-badge")
 export class HaStateLabelBadge extends LitElement {
diff --git a/src/components/ha-area-picker.ts b/src/components/ha-area-picker.ts
index 01d5e71296..ee891eeccb 100644
--- a/src/components/ha-area-picker.ts
+++ b/src/components/ha-area-picker.ts
@@ -1,3 +1,4 @@
+import "@polymer/paper-icon-button/paper-icon-button";
 import "@polymer/paper-input/paper-input";
 import "@polymer/paper-item/paper-item";
 import "@polymer/paper-item/paper-item-body";
diff --git a/src/components/ha-fab.ts b/src/components/ha-fab.ts
index aa0f382cee..3be2d7edda 100644
--- a/src/components/ha-fab.ts
+++ b/src/components/ha-fab.ts
@@ -4,6 +4,7 @@ import { ripple } from "@material/mwc-ripple/ripple-directive";
 import { customElement, html, TemplateResult } from "lit-element";
 import { classMap } from "lit-html/directives/class-map";
 import type { Constructor } from "../types";
+import "./ha-icon";
 
 const MwcFab = customElements.get("mwc-fab") as Constructor<Fab>;
 
diff --git a/src/components/ha-form/ha-form-multi_select.ts b/src/components/ha-form/ha-form-multi_select.ts
index 80e25168c7..8ef4ed95bf 100644
--- a/src/components/ha-form/ha-form-multi_select.ts
+++ b/src/components/ha-form/ha-form-multi_select.ts
@@ -1,3 +1,4 @@
+import "@polymer/iron-icon/iron-icon";
 import "@polymer/paper-checkbox/paper-checkbox";
 import "@polymer/paper-input/paper-input";
 import "@polymer/paper-item/paper-icon-item";
diff --git a/src/components/ha-form/ha-form-positive_time_period_dict.ts b/src/components/ha-form/ha-form-positive_time_period_dict.ts
index 3f4942c8ec..b43bbd4ffa 100644
--- a/src/components/ha-form/ha-form-positive_time_period_dict.ts
+++ b/src/components/ha-form/ha-form-positive_time_period_dict.ts
@@ -7,6 +7,7 @@ import {
   TemplateResult,
 } from "lit-element";
 import { fireEvent } from "../../common/dom/fire_event";
+import "../paper-time-input";
 import { HaFormElement, HaFormTimeData, HaFormTimeSchema } from "./ha-form";
 
 @customElement("ha-form-positive_time_period_dict")
diff --git a/src/components/ha-water_heater-state.js b/src/components/ha-water_heater-state.js
index 7cbe8b10c3..9a6a8c7610 100644
--- a/src/components/ha-water_heater-state.js
+++ b/src/components/ha-water_heater-state.js
@@ -1,8 +1,8 @@
 import { html } from "@polymer/polymer/lib/utils/html-tag";
 /* eslint-plugin-disable lit */
 import { PolymerElement } from "@polymer/polymer/polymer-element";
-import LocalizeMixin from "../mixins/localize-mixin";
 import { computeStateDisplay } from "../common/entity/compute_state_display";
+import LocalizeMixin from "../mixins/localize-mixin";
 
 /*
  * @appliesMixin LocalizeMixin
diff --git a/src/components/user/ha-user-picker.ts b/src/components/user/ha-user-picker.ts
index ff5dc7c379..d0d5f39be9 100644
--- a/src/components/user/ha-user-picker.ts
+++ b/src/components/user/ha-user-picker.ts
@@ -17,6 +17,7 @@ import { fireEvent } from "../../common/dom/fire_event";
 import { compare } from "../../common/string/compare";
 import { fetchUsers, User } from "../../data/user";
 import { HomeAssistant } from "../../types";
+import "./ha-user-badge";
 
 class HaUserPicker extends LitElement {
   public hass?: HomeAssistant;
diff --git a/src/dialogs/config-flow/show-dialog-config-flow.ts b/src/dialogs/config-flow/show-dialog-config-flow.ts
index 46c9657b47..9287a7958f 100644
--- a/src/dialogs/config-flow/show-dialog-config-flow.ts
+++ b/src/dialogs/config-flow/show-dialog-config-flow.ts
@@ -8,12 +8,12 @@ import {
   getConfigFlowHandlers,
   handleConfigFlowStep,
 } from "../../data/config_flow";
+import { domainToName } from "../../data/integration";
 import {
   DataEntryFlowDialogParams,
   loadDataEntryFlowDialog,
   showFlowDialog,
 } from "./show-dialog-data-entry-flow";
-import { domainToName } from "../../data/integration";
 
 export const loadConfigFlowDialog = loadDataEntryFlowDialog;
 
diff --git a/src/dialogs/config-flow/step-flow-pick-handler.ts b/src/dialogs/config-flow/step-flow-pick-handler.ts
index bf7a64c585..879824a657 100644
--- a/src/dialogs/config-flow/step-flow-pick-handler.ts
+++ b/src/dialogs/config-flow/step-flow-pick-handler.ts
@@ -16,12 +16,12 @@ import { styleMap } from "lit-html/directives/style-map";
 import memoizeOne from "memoize-one";
 import { fireEvent } from "../../common/dom/fire_event";
 import "../../common/search/search-input";
+import { LocalizeFunc } from "../../common/translations/localize";
 import "../../components/ha-icon-next";
+import { domainToName } from "../../data/integration";
 import { HomeAssistant } from "../../types";
 import { FlowConfig } from "./show-dialog-data-entry-flow";
 import { configFlowContentStyles } from "./styles";
-import { domainToName } from "../../data/integration";
-import { LocalizeFunc } from "../../common/translations/localize";
 
 interface HandlerObj {
   name: string;
diff --git a/src/dialogs/domain-toggler/dialog-domain-toggler.ts b/src/dialogs/domain-toggler/dialog-domain-toggler.ts
index 14fac5294f..d3b7e7a06a 100644
--- a/src/dialogs/domain-toggler/dialog-domain-toggler.ts
+++ b/src/dialogs/domain-toggler/dialog-domain-toggler.ts
@@ -1,3 +1,4 @@
+import "@material/mwc-button/mwc-button";
 import {
   css,
   CSSResultArray,
@@ -8,11 +9,11 @@ import {
   TemplateResult,
 } from "lit-element";
 import "../../components/dialog/ha-paper-dialog";
+import { domainToName } from "../../data/integration";
 import { PolymerChangedEvent } from "../../polymer-types";
 import { haStyleDialog } from "../../resources/styles";
 import { HomeAssistant } from "../../types";
 import { HaDomainTogglerDialogParams } from "./show-dialog-domain-toggler";
-import { domainToName } from "../../data/integration";
 
 @customElement("dialog-domain-toggler")
 class DomainTogglerDialog extends LitElement {
diff --git a/src/dialogs/generic/dialog-box.ts b/src/dialogs/generic/dialog-box.ts
index 3eca0b1b22..8c9b40aadb 100644
--- a/src/dialogs/generic/dialog-box.ts
+++ b/src/dialogs/generic/dialog-box.ts
@@ -1,3 +1,4 @@
+import "@material/mwc-button/mwc-button";
 import "@polymer/paper-dialog-scrollable/paper-dialog-scrollable";
 import "@polymer/paper-input/paper-input";
 import {
diff --git a/src/dialogs/more-info/controls/more-info-person.ts b/src/dialogs/more-info/controls/more-info-person.ts
index 746361146c..31def98ccf 100644
--- a/src/dialogs/more-info/controls/more-info-person.ts
+++ b/src/dialogs/more-info/controls/more-info-person.ts
@@ -11,6 +11,7 @@ import {
 } from "lit-element";
 import memoizeOne from "memoize-one";
 import { fireEvent } from "../../../common/dom/fire_event";
+import "../../../components/ha-attributes";
 import "../../../components/map/ha-map";
 import { showZoneEditor } from "../../../data/zone";
 import { HomeAssistant } from "../../../types";
diff --git a/src/dialogs/more-info/controls/more-info-timer.ts b/src/dialogs/more-info/controls/more-info-timer.ts
index cbfa31c883..4a1dbeb40a 100644
--- a/src/dialogs/more-info/controls/more-info-timer.ts
+++ b/src/dialogs/more-info/controls/more-info-timer.ts
@@ -8,6 +8,7 @@ import {
   property,
   TemplateResult,
 } from "lit-element";
+import "../../../components/ha-attributes";
 import { TimerEntity } from "../../../data/timer";
 import { HomeAssistant } from "../../../types";
 
diff --git a/src/dialogs/mqtt-device-debug-info-dialog/dialog-mqtt-device-debug-info.ts b/src/dialogs/mqtt-device-debug-info-dialog/dialog-mqtt-device-debug-info.ts
index 80ce1a52ef..a825d12396 100644
--- a/src/dialogs/mqtt-device-debug-info-dialog/dialog-mqtt-device-debug-info.ts
+++ b/src/dialogs/mqtt-device-debug-info-dialog/dialog-mqtt-device-debug-info.ts
@@ -1,23 +1,24 @@
+import "@material/mwc-button/mwc-button";
 import {
-  LitElement,
   css,
-  html,
   CSSResult,
-  TemplateResult,
   customElement,
+  html,
+  LitElement,
   property,
+  TemplateResult,
 } from "lit-element";
+import { computeStateName } from "../../common/entity/compute_state_name";
 import "../../components/ha-dialog";
 import "../../components/ha-switch";
-import { computeDeviceName } from "../../data/device_registry";
-import { computeStateName } from "../../common/entity/compute_state_name";
-import { haStyleDialog } from "../../resources/styles";
 import type { HaSwitch } from "../../components/ha-switch";
+import { computeDeviceName } from "../../data/device_registry";
+import { fetchMQTTDebugInfo, MQTTDeviceDebugInfo } from "../../data/mqtt";
+import { haStyleDialog } from "../../resources/styles";
 import { HomeAssistant } from "../../types";
-import { MQTTDeviceDebugInfoDialogParams } from "./show-dialog-mqtt-device-debug-info";
-import { MQTTDeviceDebugInfo, fetchMQTTDebugInfo } from "../../data/mqtt";
-import "./mqtt-messages";
 import "./mqtt-discovery-payload";
+import "./mqtt-messages";
+import { MQTTDeviceDebugInfoDialogParams } from "./show-dialog-mqtt-device-debug-info";
 
 @customElement("dialog-mqtt-device-debug-info")
 class DialogMQTTDeviceDebugInfo extends LitElement {
diff --git a/src/dialogs/mqtt-device-debug-info-dialog/mqtt-discovery-payload.ts b/src/dialogs/mqtt-device-debug-info-dialog/mqtt-discovery-payload.ts
index b000f5499a..04fc6f0a5c 100644
--- a/src/dialogs/mqtt-device-debug-info-dialog/mqtt-discovery-payload.ts
+++ b/src/dialogs/mqtt-device-debug-info-dialog/mqtt-discovery-payload.ts
@@ -1,11 +1,11 @@
-import {
-  LitElement,
-  html,
-  TemplateResult,
-  customElement,
-  property,
-} from "lit-element";
 import { safeDump } from "js-yaml";
+import {
+  customElement,
+  html,
+  LitElement,
+  property,
+  TemplateResult,
+} from "lit-element";
 
 @customElement("mqtt-discovery-payload")
 class MQTTDiscoveryPayload extends LitElement {
diff --git a/src/dialogs/mqtt-device-debug-info-dialog/mqtt-messages.ts b/src/dialogs/mqtt-device-debug-info-dialog/mqtt-messages.ts
index c3f3b799ef..401eb86141 100644
--- a/src/dialogs/mqtt-device-debug-info-dialog/mqtt-messages.ts
+++ b/src/dialogs/mqtt-device-debug-info-dialog/mqtt-messages.ts
@@ -1,11 +1,11 @@
-import {
-  LitElement,
-  html,
-  TemplateResult,
-  customElement,
-  property,
-} from "lit-element";
 import { safeDump } from "js-yaml";
+import {
+  customElement,
+  html,
+  LitElement,
+  property,
+  TemplateResult,
+} from "lit-element";
 import { MQTTMessage } from "../../data/mqtt";
 
 @customElement("mqtt-messages")
diff --git a/src/dialogs/notifications/configurator-notification-item.ts b/src/dialogs/notifications/configurator-notification-item.ts
index 5be796cdc2..296ead9767 100644
--- a/src/dialogs/notifications/configurator-notification-item.ts
+++ b/src/dialogs/notifications/configurator-notification-item.ts
@@ -7,11 +7,11 @@ import {
   TemplateResult,
 } from "lit-element";
 import { fireEvent } from "../../common/dom/fire_event";
+import { computeStateDisplay } from "../../common/entity/compute_state_display";
+import { domainToName } from "../../data/integration";
 import { PersitentNotificationEntity } from "../../data/persistent_notification";
 import { HomeAssistant } from "../../types";
 import "./notification-item-template";
-import { domainToName } from "../../data/integration";
-import { computeStateDisplay } from "../../common/entity/compute_state_display";
 
 @customElement("configurator-notification-item")
 export class HuiConfiguratorNotificationItem extends LitElement {
diff --git a/src/layouts/hass-tabs-subpage-data-table.ts b/src/layouts/hass-tabs-subpage-data-table.ts
index add5bc19d3..b55bbcfa37 100644
--- a/src/layouts/hass-tabs-subpage-data-table.ts
+++ b/src/layouts/hass-tabs-subpage-data-table.ts
@@ -1,3 +1,5 @@
+import "@material/mwc-button/mwc-button";
+import "@polymer/paper-tooltip/paper-tooltip";
 import {
   css,
   CSSResult,
@@ -8,6 +10,7 @@ import {
   query,
   TemplateResult,
 } from "lit-element";
+import { navigate } from "../common/navigate";
 import "../components/data-table/ha-data-table";
 import type {
   DataTableColumnContainer,
@@ -17,9 +20,6 @@ import type {
 import type { HomeAssistant, Route } from "../types";
 import "./hass-tabs-subpage";
 import type { PageNavigation } from "./hass-tabs-subpage";
-import "@material/mwc-button/mwc-button";
-import { navigate } from "../common/navigate";
-import "@polymer/paper-tooltip/paper-tooltip";
 
 @customElement("hass-tabs-subpage-data-table")
 export class HaTabsSubpageDataTable extends LitElement {
diff --git a/src/layouts/hass-tabs-subpage.ts b/src/layouts/hass-tabs-subpage.ts
index c5c752e1be..ac91b3b8b2 100644
--- a/src/layouts/hass-tabs-subpage.ts
+++ b/src/layouts/hass-tabs-subpage.ts
@@ -16,6 +16,7 @@ import { navigate } from "../common/navigate";
 import "../components/ha-menu-button";
 import "../components/ha-paper-icon-button-arrow-prev";
 import { HomeAssistant, Route } from "../types";
+import "../components/ha-icon";
 
 export interface PageNavigation {
   path: string;
diff --git a/src/layouts/home-assistant.ts b/src/layouts/home-assistant.ts
index cef1dd0733..76352dea69 100644
--- a/src/layouts/home-assistant.ts
+++ b/src/layouts/home-assistant.ts
@@ -1,5 +1,6 @@
 import "@polymer/app-route/app-location";
 import { html, property, PropertyValues } from "lit-element";
+import { setHAVersion } from "../common/config/version";
 import { navigate } from "../common/navigate";
 import { getStorageDefaultPanelUrlPath } from "../data/panel";
 import "../resources/custom-card-support";
@@ -12,7 +13,6 @@ import {
 } from "../util/register-service-worker";
 import "./ha-init-page";
 import "./home-assistant-main";
-import { setHAVersion } from "../common/config/version";
 
 export class HomeAssistantAppEl extends HassElement {
   @property() private _route?: Route;
diff --git a/src/onboarding/ha-onboarding.ts b/src/onboarding/ha-onboarding.ts
index 1bb279b465..414731adf7 100644
--- a/src/onboarding/ha-onboarding.ts
+++ b/src/onboarding/ha-onboarding.ts
@@ -24,10 +24,10 @@ import {
 import { subscribeUser } from "../data/ws-user";
 import { litLocalizeLiteMixin } from "../mixins/lit-localize-lite-mixin";
 import { HassElement } from "../state/hass-element";
+import { HomeAssistant } from "../types";
 import { registerServiceWorker } from "../util/register-service-worker";
 import "./onboarding-create-user";
 import "./onboarding-loading";
-import { HomeAssistant } from "../types";
 
 interface OnboardingEvent<T extends ValidOnboardingStep> {
   type: T;
diff --git a/src/onboarding/onboarding-integrations.ts b/src/onboarding/onboarding-integrations.ts
index 85ab7b2558..9e24c4d076 100644
--- a/src/onboarding/onboarding-integrations.ts
+++ b/src/onboarding/onboarding-integrations.ts
@@ -20,6 +20,7 @@ import {
   subscribeConfigFlowInProgress,
 } from "../data/config_flow";
 import { DataEntryFlowProgress } from "../data/data_entry_flow";
+import { domainToName } from "../data/integration";
 import { onboardIntegrationStep } from "../data/onboarding";
 import {
   loadConfigFlowDialog,
@@ -28,7 +29,6 @@ import {
 import { HomeAssistant } from "../types";
 import "./action-badge";
 import "./integration-badge";
-import { domainToName } from "../data/integration";
 
 @customElement("onboarding-integrations")
 class OnboardingIntegrations extends LitElement {
diff --git a/src/panels/config/automation/action/ha-automation-action-row.ts b/src/panels/config/automation/action/ha-automation-action-row.ts
index 77cb775b86..99f67af95a 100644
--- a/src/panels/config/automation/action/ha-automation-action-row.ts
+++ b/src/panels/config/automation/action/ha-automation-action-row.ts
@@ -1,3 +1,4 @@
+import "@polymer/paper-dropdown-menu/paper-dropdown-menu-light";
 import "@polymer/paper-icon-button/paper-icon-button";
 import "@polymer/paper-item/paper-item";
 import "@polymer/paper-listbox/paper-listbox";
diff --git a/src/panels/config/automation/condition/ha-automation-condition-editor.ts b/src/panels/config/automation/condition/ha-automation-condition-editor.ts
index ef6d855c4d..506b7bb8c8 100644
--- a/src/panels/config/automation/condition/ha-automation-condition-editor.ts
+++ b/src/panels/config/automation/condition/ha-automation-condition-editor.ts
@@ -1,3 +1,4 @@
+import "@polymer/paper-dropdown-menu/paper-dropdown-menu-light";
 import "@polymer/paper-item/paper-item";
 import "@polymer/paper-listbox/paper-listbox";
 import type { PaperListboxElement } from "@polymer/paper-listbox/paper-listbox";
@@ -7,6 +8,7 @@ import { fireEvent } from "../../../../common/dom/fire_event";
 import "../../../../components/ha-card";
 import type { Condition } from "../../../../data/automation";
 import type { HomeAssistant } from "../../../../types";
+import "../../../../components/ha-yaml-editor";
 import "./types/ha-automation-condition-and";
 import "./types/ha-automation-condition-device";
 import "./types/ha-automation-condition-numeric_state";
diff --git a/src/panels/config/automation/thingtalk/ha-thingtalk-placeholders.ts b/src/panels/config/automation/thingtalk/ha-thingtalk-placeholders.ts
index 0e233445a8..2e853c10a2 100644
--- a/src/panels/config/automation/thingtalk/ha-thingtalk-placeholders.ts
+++ b/src/panels/config/automation/thingtalk/ha-thingtalk-placeholders.ts
@@ -22,12 +22,13 @@ import {
   subscribeDeviceRegistry,
 } from "../../../../data/device_registry";
 import { subscribeEntityRegistry } from "../../../../data/entity_registry";
+import { domainToName } from "../../../../data/integration";
 import { SubscribeMixin } from "../../../../mixins/subscribe-mixin";
 import { PolymerChangedEvent } from "../../../../polymer-types";
 import { haStyleDialog } from "../../../../resources/styles";
 import { HomeAssistant } from "../../../../types";
+import "../../../../components/entity/ha-entity-picker";
 import { Placeholder, PlaceholderContainer } from "./dialog-thingtalk";
-import { domainToName } from "../../../../data/integration";
 
 declare global {
   // for fire event
diff --git a/src/panels/config/automation/trigger/ha-automation-trigger-row.ts b/src/panels/config/automation/trigger/ha-automation-trigger-row.ts
index 8de3792209..2b27ac5782 100644
--- a/src/panels/config/automation/trigger/ha-automation-trigger-row.ts
+++ b/src/panels/config/automation/trigger/ha-automation-trigger-row.ts
@@ -1,3 +1,4 @@
+import "@polymer/paper-dropdown-menu/paper-dropdown-menu-light";
 import "@polymer/paper-icon-button/paper-icon-button";
 import "@polymer/paper-item/paper-item";
 import "@polymer/paper-listbox/paper-listbox";
diff --git a/src/panels/config/devices/device-detail/ha-device-card-mqtt.ts b/src/panels/config/devices/device-detail/ha-device-card-mqtt.ts
index c2d1e9e824..3f0ac8561a 100644
--- a/src/panels/config/devices/device-detail/ha-device-card-mqtt.ts
+++ b/src/panels/config/devices/device-detail/ha-device-card-mqtt.ts
@@ -1,17 +1,17 @@
-import { DeviceRegistryEntry } from "../../../../data/device_registry";
-import { removeMQTTDeviceEntry } from "../../../../data/mqtt";
 import {
-  LitElement,
-  html,
+  CSSResult,
   customElement,
+  html,
+  LitElement,
   property,
   TemplateResult,
-  CSSResult,
 } from "lit-element";
+import { DeviceRegistryEntry } from "../../../../data/device_registry";
+import { removeMQTTDeviceEntry } from "../../../../data/mqtt";
 import { showConfirmationDialog } from "../../../../dialogs/generic/show-dialog-box";
 import { showMQTTDeviceDebugInfoDialog } from "../../../../dialogs/mqtt-device-debug-info-dialog/show-dialog-mqtt-device-debug-info";
-import { HomeAssistant } from "../../../../types";
 import { haStyle } from "../../../../resources/styles";
+import { HomeAssistant } from "../../../../types";
 
 @customElement("ha-device-card-mqtt")
 export class HaDeviceCardMqtt extends LitElement {
diff --git a/src/panels/config/devices/ha-config-devices-dashboard.ts b/src/panels/config/devices/ha-config-devices-dashboard.ts
index a14c7c3d13..9d31f80da3 100644
--- a/src/panels/config/devices/ha-config-devices-dashboard.ts
+++ b/src/panels/config/devices/ha-config-devices-dashboard.ts
@@ -14,6 +14,7 @@ import {
   DataTableRowData,
   RowClickedEvent,
 } from "../../../components/data-table/ha-data-table";
+import "../../../components/entity/ha-state-icon";
 import { AreaRegistryEntry } from "../../../data/area_registry";
 import { ConfigEntry } from "../../../data/config_entries";
 import {
@@ -25,11 +26,10 @@ import {
   EntityRegistryEntry,
   findBatteryEntity,
 } from "../../../data/entity_registry";
+import { domainToName } from "../../../data/integration";
 import "../../../layouts/hass-tabs-subpage-data-table";
-import "../../../components/entity/ha-state-icon";
 import { HomeAssistant, Route } from "../../../types";
 import { configSections } from "../ha-panel-config";
-import { domainToName } from "../../../data/integration";
 
 interface DeviceRowData extends DeviceRegistryEntry {
   device?: DeviceRowData;
diff --git a/src/panels/config/entities/dialog-entity-editor.ts b/src/panels/config/entities/dialog-entity-editor.ts
index 24a8928abe..055a33c0d6 100644
--- a/src/panels/config/entities/dialog-entity-editor.ts
+++ b/src/panels/config/entities/dialog-entity-editor.ts
@@ -1,4 +1,6 @@
+import "@polymer/app-layout/app-toolbar/app-toolbar";
 import "@polymer/paper-dialog-scrollable/paper-dialog-scrollable";
+import "@polymer/paper-icon-button/paper-icon-button";
 import "@polymer/paper-tabs/paper-tab";
 import "@polymer/paper-tabs/paper-tabs";
 import { HassEntity } from "home-assistant-js-websocket";
diff --git a/src/panels/config/entities/entity-registry-settings.ts b/src/panels/config/entities/entity-registry-settings.ts
index 4fb5140153..ad85511e99 100644
--- a/src/panels/config/entities/entity-registry-settings.ts
+++ b/src/panels/config/entities/entity-registry-settings.ts
@@ -1,3 +1,4 @@
+import "@material/mwc-button/mwc-button";
 import "@polymer/paper-input/paper-input";
 import { HassEntity } from "home-assistant-js-websocket";
 import {
diff --git a/src/panels/config/entities/ha-config-entities.ts b/src/panels/config/entities/ha-config-entities.ts
index 3ccdf57475..2da4fb17d4 100644
--- a/src/panels/config/entities/ha-config-entities.ts
+++ b/src/panels/config/entities/ha-config-entities.ts
@@ -22,7 +22,9 @@ import { computeDomain } from "../../../common/entity/compute_domain";
 import { computeStateName } from "../../../common/entity/compute_state_name";
 import { domainIcon } from "../../../common/entity/domain_icon";
 import { stateIcon } from "../../../common/entity/state_icon";
+import { navigate } from "../../../common/navigate";
 import "../../../common/search/search-input";
+import { LocalizeFunc } from "../../../common/translations/localize";
 import type {
   DataTableColumnContainer,
   DataTableColumnData,
@@ -30,6 +32,7 @@ import type {
   SelectionChangedEvent,
 } from "../../../components/data-table/ha-data-table";
 import "../../../components/ha-icon";
+import { ConfigEntry, getConfigEntries } from "../../../data/config_entries";
 import {
   computeEntityRegistryName,
   EntityRegistryEntry,
@@ -37,6 +40,7 @@ import {
   subscribeEntityRegistry,
   updateEntityRegistryEntry,
 } from "../../../data/entity_registry";
+import { domainToName } from "../../../data/integration";
 import { showConfirmationDialog } from "../../../dialogs/generic/show-dialog-box";
 import "../../../layouts/hass-loading-screen";
 import "../../../layouts/hass-tabs-subpage-data-table";
@@ -49,10 +53,6 @@ import {
   loadEntityEditorDialog,
   showEntityEditorDialog,
 } from "./show-dialog-entity-editor";
-import { getConfigEntries, ConfigEntry } from "../../../data/config_entries";
-import { LocalizeFunc } from "../../../common/translations/localize";
-import { domainToName } from "../../../data/integration";
-import { navigate } from "../../../common/navigate";
 
 export interface StateEntity extends EntityRegistryEntry {
   readonly?: boolean;
diff --git a/src/panels/config/helpers/dialog-helper-detail.ts b/src/panels/config/helpers/dialog-helper-detail.ts
index 4f1db280d8..f52d5c5178 100644
--- a/src/panels/config/helpers/dialog-helper-detail.ts
+++ b/src/panels/config/helpers/dialog-helper-detail.ts
@@ -1,3 +1,4 @@
+import "@material/mwc-button/mwc-button";
 import "@polymer/paper-item/paper-icon-item";
 import "@polymer/paper-tooltip/paper-tooltip";
 import {
diff --git a/src/panels/config/helpers/forms/ha-input_select-form.ts b/src/panels/config/helpers/forms/ha-input_select-form.ts
index bfbe3a1c3a..4af38cf2e1 100644
--- a/src/panels/config/helpers/forms/ha-input_select-form.ts
+++ b/src/panels/config/helpers/forms/ha-input_select-form.ts
@@ -1,5 +1,9 @@
+import "@material/mwc-button/mwc-button";
+import "@polymer/paper-icon-button/paper-icon-button";
 import "@polymer/paper-input/paper-input";
 import type { PaperInputElement } from "@polymer/paper-input/paper-input";
+import "@polymer/paper-item/paper-item";
+import "@polymer/paper-item/paper-item-body";
 import {
   css,
   CSSResult,
diff --git a/src/panels/config/helpers/forms/ha-input_text-form.ts b/src/panels/config/helpers/forms/ha-input_text-form.ts
index 5967c8f481..9839d65153 100644
--- a/src/panels/config/helpers/forms/ha-input_text-form.ts
+++ b/src/panels/config/helpers/forms/ha-input_text-form.ts
@@ -1,4 +1,6 @@
 import "@polymer/paper-input/paper-input";
+import "@polymer/paper-radio-button/paper-radio-button";
+import "@polymer/paper-radio-group/paper-radio-group";
 import {
   css,
   CSSResult,
diff --git a/src/panels/config/integrations/ha-config-integrations.ts b/src/panels/config/integrations/ha-config-integrations.ts
index d487f66efa..806e2e74c6 100644
--- a/src/panels/config/integrations/ha-config-integrations.ts
+++ b/src/panels/config/integrations/ha-config-integrations.ts
@@ -1,17 +1,18 @@
 import "@polymer/app-route/app-route";
 import { UnsubscribeFunc } from "home-assistant-js-websocket";
 import {
+  css,
+  CSSResult,
   customElement,
+  html,
+  LitElement,
   property,
   PropertyValues,
-  LitElement,
   TemplateResult,
-  html,
-  CSSResult,
-  css,
 } from "lit-element";
 import { compare } from "../../../common/string/compare";
 import { computeRTL } from "../../../common/util/compute_rtl";
+import { afterNextRender } from "../../../common/util/render-status";
 import "../../../components/entity/ha-state-icon";
 import "../../../components/ha-card";
 import "../../../components/ha-fab";
@@ -37,6 +38,7 @@ import {
   EntityRegistryEntry,
   subscribeEntityRegistry,
 } from "../../../data/entity_registry";
+import { domainToName } from "../../../data/integration";
 import { showConfigEntrySystemOptionsDialog } from "../../../dialogs/config-entry-system-options/show-dialog-config-entry-system-options";
 import { showConfigFlowDialog } from "../../../dialogs/config-flow/show-dialog-config-flow";
 import { showOptionsFlowDialog } from "../../../dialogs/config-flow/show-dialog-options-flow";
@@ -47,11 +49,9 @@ import {
 } from "../../../dialogs/generic/show-dialog-box";
 import "../../../layouts/hass-tabs-subpage";
 import { SubscribeMixin } from "../../../mixins/subscribe-mixin";
+import { haStyle } from "../../../resources/styles";
 import { HomeAssistant, Route } from "../../../types";
 import { configSections } from "../ha-panel-config";
-import { domainToName } from "../../../data/integration";
-import { haStyle } from "../../../resources/styles";
-import { afterNextRender } from "../../../common/util/render-status";
 
 @customElement("ha-config-integrations")
 class HaConfigIntegrations extends SubscribeMixin(LitElement) {
diff --git a/src/panels/config/lovelace/dashboards/dialog-lovelace-dashboard-detail.ts b/src/panels/config/lovelace/dashboards/dialog-lovelace-dashboard-detail.ts
index 365d57d316..6e36887064 100644
--- a/src/panels/config/lovelace/dashboards/dialog-lovelace-dashboard-detail.ts
+++ b/src/panels/config/lovelace/dashboards/dialog-lovelace-dashboard-detail.ts
@@ -1,3 +1,4 @@
+import "@material/mwc-button/mwc-button";
 import {
   css,
   CSSResult,
diff --git a/src/panels/config/lovelace/resources/dialog-lovelace-resource-detail.ts b/src/panels/config/lovelace/resources/dialog-lovelace-resource-detail.ts
index b369bfac8a..7613057db6 100644
--- a/src/panels/config/lovelace/resources/dialog-lovelace-resource-detail.ts
+++ b/src/panels/config/lovelace/resources/dialog-lovelace-resource-detail.ts
@@ -1,3 +1,7 @@
+import "@material/mwc-button/mwc-button";
+import "@polymer/paper-input/paper-input";
+import "@polymer/paper-item/paper-item";
+import "@polymer/paper-listbox/paper-listbox";
 import {
   css,
   CSSResult,
@@ -8,6 +12,7 @@ import {
   TemplateResult,
 } from "lit-element";
 import { createCloseHeading } from "../../../../components/ha-dialog";
+import "../../../../components/ha-paper-dropdown-menu";
 import {
   LovelaceResource,
   LovelaceResourcesMutableParams,
diff --git a/src/panels/config/scene/ha-scene-editor.ts b/src/panels/config/scene/ha-scene-editor.ts
index 85ac9d69dc..c9730784ef 100644
--- a/src/panels/config/scene/ha-scene-editor.ts
+++ b/src/panels/config/scene/ha-scene-editor.ts
@@ -1,5 +1,3 @@
-import "@polymer/app-layout/app-header/app-header";
-import "@polymer/app-layout/app-toolbar/app-toolbar";
 import "@polymer/paper-icon-button/paper-icon-button";
 import "@polymer/paper-item/paper-icon-item";
 import "@polymer/paper-item/paper-item";
@@ -49,7 +47,6 @@ import {
   SCENE_IGNORED_DOMAINS,
 } from "../../../data/scene";
 import { showConfirmationDialog } from "../../../dialogs/generic/show-dialog-box";
-import "../../../layouts/ha-app-layout";
 import { SubscribeMixin } from "../../../mixins/subscribe-mixin";
 import { haStyle } from "../../../resources/styles";
 import { HomeAssistant, Route } from "../../../types";
@@ -180,16 +177,14 @@ export class HaSceneEditor extends SubscribeMixin(LitElement) {
       : this.hass.localize("ui.panel.config.scene.editor.default_name");
 
     return html`
-        <hass-tabs-subpage
+      <hass-tabs-subpage
         .hass=${this.hass}
         .narrow=${this.narrow}
         .route=${this.route}
         .backCallback=${() => this._backTapped()}
         .tabs=${configSections.automation}
       >
-
-      ${
-        this.creatingNew
+        ${this.creatingNew
           ? ""
           : html`
               <paper-icon-button
@@ -200,201 +195,191 @@ export class HaSceneEditor extends SubscribeMixin(LitElement) {
                 icon="hass:delete"
                 @click=${this._deleteTapped}
               ></paper-icon-button>
-            `
-      }
-
-          ${
-            this._errors
-              ? html` <div class="errors">${this._errors}</div> `
-              : ""
-          }
-          ${this.narrow ? html` <span slot="header">${name}</span> ` : ""}
-          <div
-            id="root"
-            class="${classMap({
-              rtl: computeRTL(this.hass),
-            })}"
-          >
-            <ha-config-section .isWide=${this.isWide}>
-              ${!this.narrow ? html` <span slot="header">${name}</span> ` : ""}
-              <div slot="introduction">
-                ${this.hass.localize(
-                  "ui.panel.config.scene.editor.introduction"
-                )}
-              </div>
-              <ha-card>
-                <div class="card-content">
-                  <paper-input
-                    .value=${this.scene ? computeStateName(this.scene) : ""}
-                    @value-changed=${this._nameChanged}
-                    label=${this.hass.localize(
-                      "ui.panel.config.scene.editor.name"
-                    )}
-                  ></paper-input>
-                </div>
-              </ha-card>
-            </ha-config-section>
-
-            <ha-config-section .isWide=${this.isWide}>
-              <div slot="header">
-                ${this.hass.localize(
-                  "ui.panel.config.scene.editor.devices.header"
-                )}
-              </div>
-              <div slot="introduction">
-                ${this.hass.localize(
-                  "ui.panel.config.scene.editor.devices.introduction"
-                )}
-              </div>
-
-              ${devices.map(
-                (device) =>
-                  html`
-                    <ha-card>
-                      <div class="card-header">
-                        ${device.name}
-                        <paper-icon-button
-                          icon="hass:delete"
-                          title="${this.hass.localize(
-                            "ui.panel.config.scene.editor.devices.delete"
-                          )}"
-                          .device=${device.id}
-                          @click=${this._deleteDevice}
-                        ></paper-icon-button>
-                      </div>
-                      ${device.entities.map((entityId) => {
-                        const stateObj = this.hass.states[entityId];
-                        if (!stateObj) {
-                          return html``;
-                        }
-                        return html`
-                          <paper-icon-item
-                            .entityId=${entityId}
-                            @click=${this._showMoreInfo}
-                            class="device-entity"
-                          >
-                            <state-badge
-                              .stateObj=${stateObj}
-                              slot="item-icon"
-                            ></state-badge>
-                            <paper-item-body>
-                              ${computeStateName(stateObj)}
-                            </paper-item-body>
-                          </paper-icon-item>
-                        `;
-                      })}
-                    </ha-card>
-                  `
-              )}
-
-              <ha-card
-                .header=${this.hass.localize(
-                  "ui.panel.config.scene.editor.devices.add"
-                )}
-              >
-                <div class="card-content">
-                  <ha-device-picker
-                    @value-changed=${this._devicePicked}
-                    .hass=${this.hass}
-                    .label=${this.hass.localize(
-                      "ui.panel.config.scene.editor.devices.add"
-                    )}
-                  ></ha-device-picker>
-                </div>
-              </ha-card>
-            </ha-config-section>
-
-            ${
-              this.showAdvanced
-                ? html`
-                    <ha-config-section .isWide=${this.isWide}>
-                      <div slot="header">
-                        ${this.hass.localize(
-                          "ui.panel.config.scene.editor.entities.header"
-                        )}
-                      </div>
-                      <div slot="introduction">
-                        ${this.hass.localize(
-                          "ui.panel.config.scene.editor.entities.introduction"
-                        )}
-                      </div>
-                      ${entities.length
-                        ? html`
-                            <ha-card
-                              class="entities"
-                              .header=${this.hass.localize(
-                                "ui.panel.config.scene.editor.entities.without_device"
-                              )}
-                            >
-                              ${entities.map((entityId) => {
-                                const stateObj = this.hass.states[entityId];
-                                if (!stateObj) {
-                                  return html``;
-                                }
-                                return html`
-                                  <paper-icon-item
-                                    .entityId=${entityId}
-                                    @click=${this._showMoreInfo}
-                                    class="device-entity"
-                                  >
-                                    <state-badge
-                                      .stateObj=${stateObj}
-                                      slot="item-icon"
-                                    ></state-badge>
-                                    <paper-item-body>
-                                      ${computeStateName(stateObj)}
-                                    </paper-item-body>
-                                    <paper-icon-button
-                                      icon="hass:delete"
-                                      .entityId=${entityId}
-                                      .title="${this.hass.localize(
-                                        "ui.panel.config.scene.editor.entities.delete"
-                                      )}"
-                                      @click=${this._deleteEntity}
-                                    ></paper-icon-button>
-                                  </paper-icon-item>
-                                `;
-                              })}
-                            </ha-card>
-                          `
-                        : ""}
-
-                      <ha-card
-                        header=${this.hass.localize(
-                          "ui.panel.config.scene.editor.entities.add"
-                        )}
-                      >
-                        <div class="card-content">
-                          ${this.hass.localize(
-                            "ui.panel.config.scene.editor.entities.device_entities"
-                          )}
-                          <ha-entity-picker
-                            @value-changed=${this._entityPicked}
-                            .excludeDomains=${SCENE_IGNORED_DOMAINS}
-                            .hass=${this.hass}
-                            label=${this.hass.localize(
-                              "ui.panel.config.scene.editor.entities.add"
-                            )}
-                          ></ha-entity-picker>
-                        </div>
-                      </ha-card>
-                    </ha-config-section>
-                  `
-                : ""
-            }
-          </div>
-        <ha-fab
-          ?is-wide="${this.isWide}"
-          ?narrow="${this.narrow}"
-          ?dirty="${this._dirty}"
-          icon="hass:content-save"
-          .title="${this.hass.localize("ui.panel.config.scene.editor.save")}"
-          @click=${this._saveScene}
+            `}
+        ${this._errors ? html` <div class="errors">${this._errors}</div> ` : ""}
+        ${this.narrow ? html` <span slot="header">${name}</span> ` : ""}
+        <div
+          id="root"
           class="${classMap({
             rtl: computeRTL(this.hass),
           })}"
+        >
+          <ha-config-section .isWide=${this.isWide}>
+            ${!this.narrow ? html` <span slot="header">${name}</span> ` : ""}
+            <div slot="introduction">
+              ${this.hass.localize("ui.panel.config.scene.editor.introduction")}
+            </div>
+            <ha-card>
+              <div class="card-content">
+                <paper-input
+                  .value=${this.scene ? computeStateName(this.scene) : ""}
+                  @value-changed=${this._nameChanged}
+                  label=${this.hass.localize(
+                    "ui.panel.config.scene.editor.name"
+                  )}
+                ></paper-input>
+              </div>
+            </ha-card>
+          </ha-config-section>
+
+          <ha-config-section .isWide=${this.isWide}>
+            <div slot="header">
+              ${this.hass.localize(
+                "ui.panel.config.scene.editor.devices.header"
+              )}
+            </div>
+            <div slot="introduction">
+              ${this.hass.localize(
+                "ui.panel.config.scene.editor.devices.introduction"
+              )}
+            </div>
+
+            ${devices.map(
+              (device) =>
+                html`
+                  <ha-card>
+                    <div class="card-header">
+                      ${device.name}
+                      <paper-icon-button
+                        icon="hass:delete"
+                        title="${this.hass.localize(
+                          "ui.panel.config.scene.editor.devices.delete"
+                        )}"
+                        .device=${device.id}
+                        @click=${this._deleteDevice}
+                      ></paper-icon-button>
+                    </div>
+                    ${device.entities.map((entityId) => {
+                      const stateObj = this.hass.states[entityId];
+                      if (!stateObj) {
+                        return html``;
+                      }
+                      return html`
+                        <paper-icon-item
+                          .entityId=${entityId}
+                          @click=${this._showMoreInfo}
+                          class="device-entity"
+                        >
+                          <state-badge
+                            .stateObj=${stateObj}
+                            slot="item-icon"
+                          ></state-badge>
+                          <paper-item-body>
+                            ${computeStateName(stateObj)}
+                          </paper-item-body>
+                        </paper-icon-item>
+                      `;
+                    })}
+                  </ha-card>
+                `
+            )}
+
+            <ha-card
+              .header=${this.hass.localize(
+                "ui.panel.config.scene.editor.devices.add"
+              )}
+            >
+              <div class="card-content">
+                <ha-device-picker
+                  @value-changed=${this._devicePicked}
+                  .hass=${this.hass}
+                  .label=${this.hass.localize(
+                    "ui.panel.config.scene.editor.devices.add"
+                  )}
+                ></ha-device-picker>
+              </div>
+            </ha-card>
+          </ha-config-section>
+
+          ${this.showAdvanced
+            ? html`
+                <ha-config-section .isWide=${this.isWide}>
+                  <div slot="header">
+                    ${this.hass.localize(
+                      "ui.panel.config.scene.editor.entities.header"
+                    )}
+                  </div>
+                  <div slot="introduction">
+                    ${this.hass.localize(
+                      "ui.panel.config.scene.editor.entities.introduction"
+                    )}
+                  </div>
+                  ${entities.length
+                    ? html`
+                        <ha-card
+                          class="entities"
+                          .header=${this.hass.localize(
+                            "ui.panel.config.scene.editor.entities.without_device"
+                          )}
+                        >
+                          ${entities.map((entityId) => {
+                            const stateObj = this.hass.states[entityId];
+                            if (!stateObj) {
+                              return html``;
+                            }
+                            return html`
+                              <paper-icon-item
+                                .entityId=${entityId}
+                                @click=${this._showMoreInfo}
+                                class="device-entity"
+                              >
+                                <state-badge
+                                  .stateObj=${stateObj}
+                                  slot="item-icon"
+                                ></state-badge>
+                                <paper-item-body>
+                                  ${computeStateName(stateObj)}
+                                </paper-item-body>
+                                <paper-icon-button
+                                  icon="hass:delete"
+                                  .entityId=${entityId}
+                                  .title="${this.hass.localize(
+                                    "ui.panel.config.scene.editor.entities.delete"
+                                  )}"
+                                  @click=${this._deleteEntity}
+                                ></paper-icon-button>
+                              </paper-icon-item>
+                            `;
+                          })}
+                        </ha-card>
+                      `
+                    : ""}
+
+                  <ha-card
+                    header=${this.hass.localize(
+                      "ui.panel.config.scene.editor.entities.add"
+                    )}
+                  >
+                    <div class="card-content">
+                      ${this.hass.localize(
+                        "ui.panel.config.scene.editor.entities.device_entities"
+                      )}
+                      <ha-entity-picker
+                        @value-changed=${this._entityPicked}
+                        .excludeDomains=${SCENE_IGNORED_DOMAINS}
+                        .hass=${this.hass}
+                        label=${this.hass.localize(
+                          "ui.panel.config.scene.editor.entities.add"
+                        )}
+                      ></ha-entity-picker>
+                    </div>
+                  </ha-card>
+                </ha-config-section>
+              `
+            : ""}
+        </div>
+        <ha-fab
+          ?is-wide=${this.isWide}
+          ?narrow=${this.narrow}
+          ?dirty=${this._dirty}
+          icon="hass:content-save"
+          .title=${this.hass.localize("ui.panel.config.scene.editor.save")}
+          @click=${this._saveScene}
+          class=${classMap({
+            rtl: computeRTL(this.hass),
+          })}
         ></ha-fab>
-      </ha-app-layout>
+      </hass-tabs-subpage>
     `;
   }
 
diff --git a/src/panels/config/users/dialog-add-user.ts b/src/panels/config/users/dialog-add-user.ts
index b7f7858766..66833d4d90 100644
--- a/src/panels/config/users/dialog-add-user.ts
+++ b/src/panels/config/users/dialog-add-user.ts
@@ -1,4 +1,5 @@
 import "@material/mwc-button";
+import "@polymer/paper-input/paper-input";
 import "@polymer/paper-spinner/paper-spinner";
 import {
   css,
diff --git a/src/panels/config/zha/zha-device-card.ts b/src/panels/config/zha/zha-device-card.ts
index 5d7d887664..1bac828040 100644
--- a/src/panels/config/zha/zha-device-card.ts
+++ b/src/panels/config/zha/zha-device-card.ts
@@ -36,12 +36,12 @@ import {
   ZHADevice,
   ZHAEntityReference,
 } from "../../../data/zha";
+import { showZHADeviceZigbeeInfoDialog } from "../../../dialogs/zha-device-zigbee-signature-dialog/show-dialog-zha-device-zigbee-info";
 import { haStyle } from "../../../resources/styles";
 import { HomeAssistant } from "../../../types";
 import { addEntitiesToLovelaceView } from "../../lovelace/editor/add-entities-to-view";
 import { formatAsPaddedHex } from "./functions";
 import { ItemSelectedEvent, NodeServiceData } from "./types";
-import { showZHADeviceZigbeeInfoDialog } from "../../../dialogs/zha-device-zigbee-signature-dialog/show-dialog-zha-device-zigbee-info";
 
 declare global {
   // for fire event
diff --git a/src/panels/developer-tools/info/integrations-card.ts b/src/panels/developer-tools/info/integrations-card.ts
index 980b554012..1c9c9761ba 100644
--- a/src/panels/developer-tools/info/integrations-card.ts
+++ b/src/panels/developer-tools/info/integrations-card.ts
@@ -8,11 +8,12 @@ import {
   TemplateResult,
 } from "lit-element";
 import memoizeOne from "memoize-one";
+import "../../../components/ha-card";
 import {
+  domainToName,
+  fetchIntegrationManifests,
   integrationIssuesUrl,
   IntegrationManifest,
-  fetchIntegrationManifests,
-  domainToName,
 } from "../../../data/integration";
 import { HomeAssistant } from "../../../types";
 
diff --git a/src/panels/developer-tools/info/system-health-card.ts b/src/panels/developer-tools/info/system-health-card.ts
index 2fdec54f37..0ff2151131 100644
--- a/src/panels/developer-tools/info/system-health-card.ts
+++ b/src/panels/developer-tools/info/system-health-card.ts
@@ -8,12 +8,12 @@ import {
   TemplateResult,
 } from "lit-element";
 import "../../../components/ha-card";
+import { domainToName } from "../../../data/integration";
 import {
   fetchSystemHealthInfo,
   SystemHealthInfo,
 } from "../../../data/system_health";
 import { HomeAssistant } from "../../../types";
-import { domainToName } from "../../../data/integration";
 
 const sortKeys = (a: string, b: string) => {
   if (a === "homeassistant") {
diff --git a/src/panels/developer-tools/logs/dialog-system-log-detail.ts b/src/panels/developer-tools/logs/dialog-system-log-detail.ts
index cfa468c93a..f799ec0475 100644
--- a/src/panels/developer-tools/logs/dialog-system-log-detail.ts
+++ b/src/panels/developer-tools/logs/dialog-system-log-detail.ts
@@ -10,9 +10,9 @@ import {
 import "../../../components/dialog/ha-paper-dialog";
 import {
   domainToName,
+  fetchIntegrationManifest,
   integrationIssuesUrl,
   IntegrationManifest,
-  fetchIntegrationManifest,
 } from "../../../data/integration";
 import { getLoggedErrorIntegration } from "../../../data/system_log";
 import { PolymerChangedEvent } from "../../../polymer-types";
diff --git a/src/panels/lovelace/cards/hui-empty-state-card.ts b/src/panels/lovelace/cards/hui-empty-state-card.ts
index 8118ffc1dd..b539111d95 100644
--- a/src/panels/lovelace/cards/hui-empty-state-card.ts
+++ b/src/panels/lovelace/cards/hui-empty-state-card.ts
@@ -1,3 +1,4 @@
+import "@material/mwc-button/mwc-button";
 import {
   css,
   CSSResult,
@@ -49,7 +50,7 @@ export class HuiEmptyStateCard extends LitElement implements LovelaceCard {
             </mwc-button>
           </a>
         </div>
-      </header-card>
+      </ha-card>
     `;
   }
 
diff --git a/src/panels/lovelace/cards/hui-entity-card.ts b/src/panels/lovelace/cards/hui-entity-card.ts
index 2c44e818a3..cc57b8ac75 100644
--- a/src/panels/lovelace/cards/hui-entity-card.ts
+++ b/src/panels/lovelace/cards/hui-entity-card.ts
@@ -10,6 +10,7 @@ import {
 } from "lit-element";
 import { applyThemesOnElement } from "../../../common/dom/apply_themes_on_element";
 import { fireEvent } from "../../../common/dom/fire_event";
+import { computeStateDisplay } from "../../../common/entity/compute_state_display";
 import { computeStateName } from "../../../common/entity/compute_state_name";
 import { stateIcon } from "../../../common/entity/state_icon";
 import { isValidEntityId } from "../../../common/entity/valid_entity_id";
@@ -29,7 +30,6 @@ import {
 } from "../types";
 import { HuiErrorCard } from "./hui-error-card";
 import { EntityCardConfig } from "./types";
-import { computeStateDisplay } from "../../../common/entity/compute_state_display";
 
 @customElement("hui-entity-card")
 export class HuiEntityCard extends LitElement implements LovelaceCard {
diff --git a/src/panels/lovelace/cards/hui-glance-card.ts b/src/panels/lovelace/cards/hui-glance-card.ts
index 8d4041e5d0..063d29c41d 100644
--- a/src/panels/lovelace/cards/hui-glance-card.ts
+++ b/src/panels/lovelace/cards/hui-glance-card.ts
@@ -28,6 +28,7 @@ import { hasAction } from "../common/has-action";
 import { processConfigEntities } from "../common/process-config-entities";
 import "../components/hui-warning-element";
 import { LovelaceCard, LovelaceCardEditor } from "../types";
+import "../components/hui-timestamp-display";
 import { GlanceCardConfig, GlanceConfigEntity } from "./types";
 
 @customElement("hui-glance-card")
diff --git a/src/panels/lovelace/cards/hui-light-card.ts b/src/panels/lovelace/cards/hui-light-card.ts
index 41d815a3eb..d2d8cbb544 100644
--- a/src/panels/lovelace/cards/hui-light-card.ts
+++ b/src/panels/lovelace/cards/hui-light-card.ts
@@ -14,6 +14,7 @@ import { classMap } from "lit-html/directives/class-map";
 import { styleMap } from "lit-html/directives/style-map";
 import { applyThemesOnElement } from "../../../common/dom/apply_themes_on_element";
 import { fireEvent } from "../../../common/dom/fire_event";
+import { computeStateDisplay } from "../../../common/entity/compute_state_display";
 import { computeStateName } from "../../../common/entity/compute_state_name";
 import { stateIcon } from "../../../common/entity/state_icon";
 import { supportsFeature } from "../../../common/entity/supports-feature";
@@ -30,7 +31,6 @@ import { hasConfigOrEntityChanged } from "../common/has-changed";
 import "../components/hui-warning";
 import { LovelaceCard, LovelaceCardEditor } from "../types";
 import { LightCardConfig } from "./types";
-import { computeStateDisplay } from "../../../common/entity/compute_state_display";
 
 @customElement("hui-light-card")
 export class HuiLightCard extends LitElement implements LovelaceCard {
diff --git a/src/panels/lovelace/cards/hui-map-card.ts b/src/panels/lovelace/cards/hui-map-card.ts
index cf9e230067..f215b0b214 100644
--- a/src/panels/lovelace/cards/hui-map-card.ts
+++ b/src/panels/lovelace/cards/hui-map-card.ts
@@ -37,6 +37,7 @@ import { findEntities } from "../common/find-entites";
 import { processConfigEntities } from "../common/process-config-entities";
 import { EntityConfig } from "../entity-rows/types";
 import { LovelaceCard } from "../types";
+import "../../../components/ha-card";
 import { MapCardConfig } from "./types";
 
 @customElement("hui-map-card")
diff --git a/src/panels/lovelace/cards/hui-media-control-card.ts b/src/panels/lovelace/cards/hui-media-control-card.ts
index 50811470fc..a67ce7b7ba 100644
--- a/src/panels/lovelace/cards/hui-media-control-card.ts
+++ b/src/panels/lovelace/cards/hui-media-control-card.ts
@@ -45,6 +45,7 @@ import { findEntities } from "../common/find-entites";
 import { hasConfigOrEntityChanged } from "../common/has-changed";
 import "../components/hui-marquee";
 import type { LovelaceCard, LovelaceCardEditor } from "../types";
+import "../components/hui-warning";
 import { MediaControlCardConfig } from "./types";
 
 function getContrastRatio(
diff --git a/src/panels/lovelace/cards/hui-picture-elements-card.ts b/src/panels/lovelace/cards/hui-picture-elements-card.ts
index a21722bf17..a57a4a53df 100644
--- a/src/panels/lovelace/cards/hui-picture-elements-card.ts
+++ b/src/panels/lovelace/cards/hui-picture-elements-card.ts
@@ -9,6 +9,7 @@ import {
   TemplateResult,
 } from "lit-element";
 import { applyThemesOnElement } from "../../../common/dom/apply_themes_on_element";
+import "../../../components/ha-card";
 import { HomeAssistant } from "../../../types";
 import { findEntities } from "../common/find-entites";
 import { LovelaceElement, LovelaceElementConfig } from "../elements/types";
@@ -107,7 +108,7 @@ class HuiPictureElementsCard extends LitElement implements LovelaceCard {
     }
 
     return html`
-      <ha-card .header="${this._config.title}">
+      <ha-card .header=${this._config.title}>
         <div id="root">
           <hui-image
             .hass=${this._hass}
diff --git a/src/panels/lovelace/cards/hui-thermostat-card.ts b/src/panels/lovelace/cards/hui-thermostat-card.ts
index 04f0e76ab6..af84967fdf 100644
--- a/src/panels/lovelace/cards/hui-thermostat-card.ts
+++ b/src/panels/lovelace/cards/hui-thermostat-card.ts
@@ -386,7 +386,7 @@ export class HuiThermostatCard extends LitElement implements LovelaceCard {
         @action=${this._handleAction}
         .actionHandler=${actionHandler()}
         tabindex="0"
-      ></ha-icon>
+      ></paper-icon-button>
     `;
   }
 
diff --git a/src/panels/lovelace/cards/hui-weather-forecast-card.ts b/src/panels/lovelace/cards/hui-weather-forecast-card.ts
index 0f5c9c249c..de40b4af6a 100644
--- a/src/panels/lovelace/cards/hui-weather-forecast-card.ts
+++ b/src/panels/lovelace/cards/hui-weather-forecast-card.ts
@@ -8,31 +8,29 @@ import {
   PropertyValues,
   TemplateResult,
 } from "lit-element";
-
-import "../../../components/ha-icon";
-import "../../../components/ha-card";
-import "../components/hui-warning";
-
-import { WeatherForecastCardConfig } from "./types";
-import { LovelaceCard, LovelaceCardEditor } from "../types";
-import { HomeAssistant, WeatherEntity } from "../../../types";
-import { findEntities } from "../common/find-entites";
-import { hasConfigOrEntityChanged } from "../common/has-changed";
-import { actionHandler } from "../common/directives/action-handler-directive";
-import { isValidEntityId } from "../../../common/entity/valid_entity_id";
-import { computeStateName } from "../../../common/entity/compute_state_name";
-import { fireEvent } from "../../../common/dom/fire_event";
 import { applyThemesOnElement } from "../../../common/dom/apply_themes_on_element";
+import { fireEvent } from "../../../common/dom/fire_event";
+import { computeStateDisplay } from "../../../common/entity/compute_state_display";
+import { computeStateName } from "../../../common/entity/compute_state_name";
+import { stateIcon } from "../../../common/entity/state_icon";
+import { isValidEntityId } from "../../../common/entity/valid_entity_id";
 import { debounce } from "../../../common/util/debounce";
+import "../../../components/ha-card";
+import "../../../components/ha-icon";
 import { UNAVAILABLE } from "../../../data/entity";
 import {
-  weatherIcons,
   getSecondaryWeatherAttribute,
   getWeatherUnit,
+  weatherIcons,
   weatherImages,
 } from "../../../data/weather";
-import { stateIcon } from "../../../common/entity/state_icon";
-import { computeStateDisplay } from "../../../common/entity/compute_state_display";
+import { HomeAssistant, WeatherEntity } from "../../../types";
+import { actionHandler } from "../common/directives/action-handler-directive";
+import { findEntities } from "../common/find-entites";
+import { hasConfigOrEntityChanged } from "../common/has-changed";
+import "../components/hui-warning";
+import { LovelaceCard, LovelaceCardEditor } from "../types";
+import { WeatherForecastCardConfig } from "./types";
 
 const DAY_IN_MILLISECONDS = 86400000;
 
diff --git a/src/panels/lovelace/common/generate-lovelace-config.ts b/src/panels/lovelace/common/generate-lovelace-config.ts
index 6190d6e4fb..80d5230bb6 100644
--- a/src/panels/lovelace/common/generate-lovelace-config.ts
+++ b/src/panels/lovelace/common/generate-lovelace-config.ts
@@ -25,6 +25,7 @@ import {
   EntityRegistryEntry,
   subscribeEntityRegistry,
 } from "../../../data/entity_registry";
+import { domainToName } from "../../../data/integration";
 import {
   LovelaceCardConfig,
   LovelaceConfig,
@@ -41,7 +42,6 @@ import {
 } from "../cards/types";
 import { processEditorEntities } from "../editor/process-editor-entities";
 import { LovelaceRowConfig, WeblinkConfig } from "../entity-rows/types";
-import { domainToName } from "../../../data/integration";
 
 const DEFAULT_VIEW_ENTITY_ID = "group.default_view";
 const DOMAINS_BADGES = [
diff --git a/src/panels/lovelace/components/hui-image.ts b/src/panels/lovelace/components/hui-image.ts
index c443bff079..2198bd3754 100644
--- a/src/panels/lovelace/components/hui-image.ts
+++ b/src/panels/lovelace/components/hui-image.ts
@@ -13,6 +13,7 @@ import { classMap } from "lit-html/directives/class-map";
 import { styleMap } from "lit-html/directives/style-map";
 import { STATES_OFF } from "../../../common/const";
 import parseAspectRatio from "../../../common/util/parse-aspect-ratio";
+import "../../../components/ha-camera-stream";
 import { fetchThumbnailUrlWithCache } from "../../../data/camera";
 import { CameraEntity, HomeAssistant } from "../../../types";
 
diff --git a/src/panels/lovelace/components/hui-input-list-editor.ts b/src/panels/lovelace/components/hui-input-list-editor.ts
index 0b5ea2e893..daeed5110e 100644
--- a/src/panels/lovelace/components/hui-input-list-editor.ts
+++ b/src/panels/lovelace/components/hui-input-list-editor.ts
@@ -1,3 +1,4 @@
+import "@polymer/paper-icon-button/paper-icon-button";
 import "@polymer/paper-input/paper-input";
 import {
   css,
diff --git a/src/panels/lovelace/components/hui-theme-select-editor.ts b/src/panels/lovelace/components/hui-theme-select-editor.ts
index a684a3ba3a..d82289c676 100644
--- a/src/panels/lovelace/components/hui-theme-select-editor.ts
+++ b/src/panels/lovelace/components/hui-theme-select-editor.ts
@@ -1,4 +1,7 @@
 import "@material/mwc-button";
+import "@polymer/paper-dropdown-menu/paper-dropdown-menu";
+import "@polymer/paper-item/paper-item";
+import "@polymer/paper-listbox/paper-listbox";
 import {
   css,
   CSSResult,
diff --git a/src/panels/lovelace/editor/card-editor/hui-card-picker.ts b/src/panels/lovelace/editor/card-editor/hui-card-picker.ts
index eb0e767a18..3d4be3394e 100644
--- a/src/panels/lovelace/editor/card-editor/hui-card-picker.ts
+++ b/src/panels/lovelace/editor/card-editor/hui-card-picker.ts
@@ -1,3 +1,4 @@
+import * as Fuse from "fuse.js";
 import {
   css,
   CSSResult,
@@ -11,17 +12,14 @@ import {
 import { classMap } from "lit-html/directives/class-map";
 import { until } from "lit-html/directives/until";
 import memoizeOne from "memoize-one";
-import * as Fuse from "fuse.js";
-
-import { CardPickTarget } from "../types";
-import { LovelaceCard } from "../../types";
-import { LovelaceCardConfig, LovelaceConfig } from "../../../../data/lovelace";
 import { fireEvent } from "../../../../common/dom/fire_event";
+import "../../../../common/search/search-input";
 import { UNAVAILABLE_STATES } from "../../../../data/entity";
+import { LovelaceCardConfig, LovelaceConfig } from "../../../../data/lovelace";
 import {
-  CUSTOM_TYPE_PREFIX,
   CustomCardEntry,
   customCards,
+  CUSTOM_TYPE_PREFIX,
   getCustomCardEntry,
 } from "../../../../data/lovelace_custom_cards";
 import { HomeAssistant } from "../../../../types";
@@ -30,9 +28,9 @@ import {
   computeUsedEntities,
 } from "../../common/compute-unused-entities";
 import { createCardElement } from "../../create-element/create-card-element";
+import { LovelaceCard } from "../../types";
 import { getCardStubConfig } from "../get-card-stub-config";
-
-import "../../../../common/search/search-input";
+import { CardPickTarget } from "../types";
 
 interface Card {
   type: string;
diff --git a/src/panels/lovelace/editor/card-editor/hui-dialog-move-card-view.ts b/src/panels/lovelace/editor/card-editor/hui-dialog-move-card-view.ts
index ad969baf53..c0cfcd9e68 100644
--- a/src/panels/lovelace/editor/card-editor/hui-dialog-move-card-view.ts
+++ b/src/panels/lovelace/editor/card-editor/hui-dialog-move-card-view.ts
@@ -35,11 +35,12 @@ export class HuiDialogMoveCardView extends LitElement {
         @opened-changed="${this._openedChanged}"
       >
         <h2>Choose view to move card</h2>
-        <hui-views-list 
-        .lovelaceConfig=${this._params!.lovelace.config} 
-        .selected=${this._params!.path![0]} 
-        @view-selected=${this._moveCard}>
-        </hui-view-list>
+        <hui-views-list
+          .lovelaceConfig=${this._params!.lovelace.config}
+          .selected=${this._params!.path![0]}
+          @view-selected=${this._moveCard}
+        >
+        </hui-views-list>
       </ha-paper-dialog>
     `;
   }
diff --git a/src/panels/lovelace/editor/config-elements/hui-button-card-editor.ts b/src/panels/lovelace/editor/config-elements/hui-button-card-editor.ts
index ac90dca17e..17b5ae531c 100644
--- a/src/panels/lovelace/editor/config-elements/hui-button-card-editor.ts
+++ b/src/panels/lovelace/editor/config-elements/hui-button-card-editor.ts
@@ -22,6 +22,7 @@ import {
   EditorTarget,
   EntitiesEditorEvent,
 } from "../types";
+import "../../../../components/ha-switch";
 import { configElementStyle } from "./config-elements-style";
 
 const cardConfigStruct = struct({
diff --git a/src/panels/lovelace/editor/config-elements/hui-conditional-card-editor.ts b/src/panels/lovelace/editor/config-elements/hui-conditional-card-editor.ts
index 086c58d4fc..a7a5b694d8 100644
--- a/src/panels/lovelace/editor/config-elements/hui-conditional-card-editor.ts
+++ b/src/panels/lovelace/editor/config-elements/hui-conditional-card-editor.ts
@@ -1,4 +1,5 @@
 import "@polymer/paper-tabs";
+import "@polymer/paper-tabs/paper-tab";
 import {
   css,
   CSSResult,
@@ -21,6 +22,7 @@ import {
   ConfigChangedEvent,
   HuiCardEditor,
 } from "../card-editor/hui-card-editor";
+import "../card-editor/hui-card-picker";
 import { GUIModeChangedEvent } from "../types";
 
 const conditionStruct = struct({
diff --git a/src/panels/lovelace/editor/config-elements/hui-map-card-editor.ts b/src/panels/lovelace/editor/config-elements/hui-map-card-editor.ts
index 62fc12f5f3..995cb222ff 100644
--- a/src/panels/lovelace/editor/config-elements/hui-map-card-editor.ts
+++ b/src/panels/lovelace/editor/config-elements/hui-map-card-editor.ts
@@ -23,6 +23,7 @@ import {
   entitiesConfigStruct,
   EntitiesEditorEvent,
 } from "../types";
+import "../../../../components/ha-switch";
 import { configElementStyle } from "./config-elements-style";
 
 const cardConfigStruct = struct({
diff --git a/src/panels/lovelace/editor/config-elements/hui-stack-card-editor.ts b/src/panels/lovelace/editor/config-elements/hui-stack-card-editor.ts
index ffc36e9247..b7bc77f969 100644
--- a/src/panels/lovelace/editor/config-elements/hui-stack-card-editor.ts
+++ b/src/panels/lovelace/editor/config-elements/hui-stack-card-editor.ts
@@ -1,4 +1,6 @@
+import "@polymer/paper-icon-button/paper-icon-button";
 import "@polymer/paper-tabs";
+import "@polymer/paper-tabs/paper-tab";
 import {
   css,
   CSSResult,
@@ -19,6 +21,7 @@ import {
   ConfigChangedEvent,
   HuiCardEditor,
 } from "../card-editor/hui-card-editor";
+import "../card-editor/hui-card-picker";
 import { GUIModeChangedEvent } from "../types";
 
 const cardConfigStruct = struct({
@@ -79,63 +82,61 @@ export class HuiStackCardEditor extends LitElement
             <paper-tab>
               <ha-icon icon="hass:plus"></ha-icon>
             </paper-tab>
-          <paper-tabs>
+          </paper-tabs>
         </div>
 
         <div id="editor">
-          ${
-            selected < numcards
-              ? html`
-                  <div id="card-options">
-                    <mwc-button
-                      @click=${this._toggleMode}
-                      .disabled=${!this._guiModeAvailable}
-                      class="gui-mode-button"
-                    >
-                      ${this.hass!.localize(
-                        !this._cardEditorEl || this._GUImode
-                          ? "ui.panel.lovelace.editor.edit_card.show_code_editor"
-                          : "ui.panel.lovelace.editor.edit_card.show_visual_editor"
-                      )}
-                    </mwc-button>
-                    <paper-icon-button
-                      id="move-before"
-                      title="Move card before"
-                      icon="hass:arrow-left"
-                      .disabled=${selected === 0}
-                      @click=${this._handleMove}
-                    ></paper-icon-button>
+          ${selected < numcards
+            ? html`
+                <div id="card-options">
+                  <mwc-button
+                    @click=${this._toggleMode}
+                    .disabled=${!this._guiModeAvailable}
+                    class="gui-mode-button"
+                  >
+                    ${this.hass!.localize(
+                      !this._cardEditorEl || this._GUImode
+                        ? "ui.panel.lovelace.editor.edit_card.show_code_editor"
+                        : "ui.panel.lovelace.editor.edit_card.show_visual_editor"
+                    )}
+                  </mwc-button>
+                  <paper-icon-button
+                    id="move-before"
+                    title="Move card before"
+                    icon="hass:arrow-left"
+                    .disabled=${selected === 0}
+                    @click=${this._handleMove}
+                  ></paper-icon-button>
 
-                    <paper-icon-button
-                      id="move-after"
-                      title="Move card after"
-                      icon="hass:arrow-right"
-                      .disabled=${selected === numcards - 1}
-                      @click=${this._handleMove}
-                    ></paper-icon-button>
+                  <paper-icon-button
+                    id="move-after"
+                    title="Move card after"
+                    icon="hass:arrow-right"
+                    .disabled=${selected === numcards - 1}
+                    @click=${this._handleMove}
+                  ></paper-icon-button>
 
-                    <paper-icon-button
-                      icon="hass:delete"
-                      @click=${this._handleDeleteCard}
-                    ></paper-icon-button>
-                  </div>
+                  <paper-icon-button
+                    icon="hass:delete"
+                    @click=${this._handleDeleteCard}
+                  ></paper-icon-button>
+                </div>
 
-                  <hui-card-editor
-                    .hass=${this.hass}
-                    .value=${this._config.cards[selected]}
-                    .lovelace=${this.lovelace}
-                    @config-changed=${this._handleConfigChanged}
-                    @GUImode-changed=${this._handleGUIModeChanged}
-                  ></hui-card-editor>
-                `
-              : html`
-                  <hui-card-picker
-                    .hass=${this.hass}
-                    .lovelace=${this.lovelace}
-                    @config-changed="${this._handleCardPicked}"
-                  ></hui-card-picker>
-                `
-          }
+                <hui-card-editor
+                  .hass=${this.hass}
+                  .value=${this._config.cards[selected]}
+                  .lovelace=${this.lovelace}
+                  @config-changed=${this._handleConfigChanged}
+                  @GUImode-changed=${this._handleGUIModeChanged}
+                ></hui-card-editor>
+              `
+            : html`
+                <hui-card-picker
+                  .hass=${this.hass}
+                  .lovelace=${this.lovelace}
+                  @config-changed="${this._handleCardPicked}"
+                ></hui-card-picker>
+              `}
         </div>
       </div>
     `;
diff --git a/src/panels/lovelace/editor/config-elements/hui-weather-forecast-card-editor.ts b/src/panels/lovelace/editor/config-elements/hui-weather-forecast-card-editor.ts
index c72f30c2a2..e4f9ab4815 100644
--- a/src/panels/lovelace/editor/config-elements/hui-weather-forecast-card-editor.ts
+++ b/src/panels/lovelace/editor/config-elements/hui-weather-forecast-card-editor.ts
@@ -8,13 +8,12 @@ import {
 import { fireEvent } from "../../../../common/dom/fire_event";
 import "../../../../components/entity/ha-entity-picker";
 import "../../../../components/ha-switch";
-
-import { EntitiesEditorEvent, EditorTarget } from "../types";
 import { HomeAssistant } from "../../../../types";
 import { WeatherForecastCardConfig } from "../../cards/types";
 import { struct } from "../../common/structs/struct";
 import "../../components/hui-theme-select-editor";
 import { LovelaceCardEditor } from "../../types";
+import { EditorTarget, EntitiesEditorEvent } from "../types";
 import { configElementStyle } from "./config-elements-style";
 
 const cardConfigStruct = struct({
diff --git a/src/panels/lovelace/editor/hui-dialog-save-config.ts b/src/panels/lovelace/editor/hui-dialog-save-config.ts
index 30f60d2a04..9ca6a348a5 100644
--- a/src/panels/lovelace/editor/hui-dialog-save-config.ts
+++ b/src/panels/lovelace/editor/hui-dialog-save-config.ts
@@ -1,4 +1,5 @@
 import "@material/mwc-button";
+import "@polymer/paper-dialog-scrollable/paper-dialog-scrollable";
 import "@polymer/paper-spinner/paper-spinner";
 import {
   css,
diff --git a/src/panels/lovelace/editor/select-view/hui-dialog-select-view.ts b/src/panels/lovelace/editor/select-view/hui-dialog-select-view.ts
index 9aae8ec878..a9b90a0d2b 100644
--- a/src/panels/lovelace/editor/select-view/hui-dialog-select-view.ts
+++ b/src/panels/lovelace/editor/select-view/hui-dialog-select-view.ts
@@ -43,10 +43,11 @@ export class HuiDialogSelectView extends LitElement {
         @opened-changed="${this._openedChanged}"
       >
         <h2>Choose a view</h2>
-        <hui-views-list 
-        .lovelaceConfig=${this._params!.lovelaceConfig}
-        @view-selected=${this._selectView}>
-        </hui-view-list>
+        <hui-views-list
+          .lovelaceConfig=${this._params!.lovelaceConfig}
+          @view-selected=${this._selectView}
+        >
+        </hui-views-list>
       </ha-paper-dialog>
     `;
   }
diff --git a/src/panels/lovelace/entity-rows/hui-input-number-entity-row.ts b/src/panels/lovelace/entity-rows/hui-input-number-entity-row.ts
index 92d55253f7..ab7e839980 100644
--- a/src/panels/lovelace/entity-rows/hui-input-number-entity-row.ts
+++ b/src/panels/lovelace/entity-rows/hui-input-number-entity-row.ts
@@ -1,3 +1,4 @@
+import "@polymer/paper-input/paper-input";
 import {
   css,
   CSSResult,
diff --git a/src/panels/lovelace/entity-rows/hui-lock-entity-row.ts b/src/panels/lovelace/entity-rows/hui-lock-entity-row.ts
index 322ec83208..d37018cd71 100644
--- a/src/panels/lovelace/entity-rows/hui-lock-entity-row.ts
+++ b/src/panels/lovelace/entity-rows/hui-lock-entity-row.ts
@@ -1,3 +1,4 @@
+import "@material/mwc-button/mwc-button";
 import {
   css,
   CSSResult,
diff --git a/src/panels/lovelace/entity-rows/hui-scene-entity-row.ts b/src/panels/lovelace/entity-rows/hui-scene-entity-row.ts
index 15b0f77798..87e16c12b7 100644
--- a/src/panels/lovelace/entity-rows/hui-scene-entity-row.ts
+++ b/src/panels/lovelace/entity-rows/hui-scene-entity-row.ts
@@ -1,3 +1,4 @@
+import "@material/mwc-button/mwc-button";
 import {
   css,
   CSSResult,
diff --git a/src/panels/lovelace/entity-rows/hui-script-entity-row.ts b/src/panels/lovelace/entity-rows/hui-script-entity-row.ts
index 35413531b0..01e8a5bddb 100644
--- a/src/panels/lovelace/entity-rows/hui-script-entity-row.ts
+++ b/src/panels/lovelace/entity-rows/hui-script-entity-row.ts
@@ -1,3 +1,4 @@
+import "@material/mwc-button/mwc-button";
 import {
   css,
   CSSResult,
diff --git a/src/panels/lovelace/entity-rows/hui-weather-entity-row.ts b/src/panels/lovelace/entity-rows/hui-weather-entity-row.ts
index a5a0b9bf90..2e04013bb1 100644
--- a/src/panels/lovelace/entity-rows/hui-weather-entity-row.ts
+++ b/src/panels/lovelace/entity-rows/hui-weather-entity-row.ts
@@ -8,19 +8,21 @@ import {
   PropertyValues,
   TemplateResult,
 } from "lit-element";
+import { computeStateDisplay } from "../../../common/entity/compute_state_display";
 import "../../../components/entity/state-badge";
 import { UNAVAILABLE_STATES } from "../../../data/entity";
 import {
+  getSecondaryWeatherAttribute,
   getWeatherUnit,
   weatherIcons,
   weatherImages,
-  getSecondaryWeatherAttribute,
 } from "../../../data/weather";
 import { HomeAssistant, WeatherEntity } from "../../../types";
 import { EntitiesCardEntityConfig } from "../cards/types";
 import { hasConfigOrEntityChanged } from "../common/has-changed";
+import "../components/hui-generic-entity-row";
+import "../components/hui-warning";
 import { LovelaceRow } from "./types";
-import { computeStateDisplay } from "../../../common/entity/compute_state_display";
 
 @customElement("hui-weather-entity-row")
 class HuiWeatherEntityRow extends LitElement implements LovelaceRow {
diff --git a/src/panels/lovelace/ha-panel-lovelace.ts b/src/panels/lovelace/ha-panel-lovelace.ts
index e405ac902f..16a0054c92 100644
--- a/src/panels/lovelace/ha-panel-lovelace.ts
+++ b/src/panels/lovelace/ha-panel-lovelace.ts
@@ -7,6 +7,7 @@ import {
   PropertyValues,
   TemplateResult,
 } from "lit-element";
+import { domainToName } from "../../data/integration";
 import {
   deleteConfig,
   fetchConfig,
@@ -25,7 +26,6 @@ import { loadLovelaceResources } from "./common/load-resources";
 import { showSaveDialog } from "./editor/show-save-config-dialog";
 import "./hui-root";
 import { Lovelace } from "./types";
-import { domainToName } from "../../data/integration";
 
 (window as any).loadCardHelpers = () => import("./custom-card-helpers");
 
diff --git a/src/panels/lovelace/header-footer/hui-graph-header-footer.ts b/src/panels/lovelace/header-footer/hui-graph-header-footer.ts
index 05f311fd83..0d0c04422f 100644
--- a/src/panels/lovelace/header-footer/hui-graph-header-footer.ts
+++ b/src/panels/lovelace/header-footer/hui-graph-header-footer.ts
@@ -1,3 +1,5 @@
+import "@polymer/paper-spinner/paper-spinner";
+import { HassEntity } from "home-assistant-js-websocket";
 import {
   css,
   CSSResult,
@@ -8,16 +10,13 @@ import {
   PropertyValues,
   TemplateResult,
 } from "lit-element";
+import { fetchRecent } from "../../../data/history";
 import { HomeAssistant } from "../../../types";
-import { HassEntity } from "home-assistant-js-websocket";
-
-import "@polymer/paper-spinner/paper-spinner";
+import { coordinates } from "../common/graph/coordinates";
+import { hasConfigOrEntityChanged } from "../common/has-changed";
 import "../components/hui-graph-base";
 import { LovelaceHeaderFooter } from "../types";
 import { GraphHeaderFooterConfig } from "./types";
-import { hasConfigOrEntityChanged } from "../common/has-changed";
-import { fetchRecent } from "../../../data/history";
-import { coordinates } from "../common/graph/coordinates";
 
 const MINUTE = 60000;
 const DAY = 86400000;
diff --git a/src/panels/lovelace/hui-root.ts b/src/panels/lovelace/hui-root.ts
index 2501ccdf5f..c311e930f3 100644
--- a/src/panels/lovelace/hui-root.ts
+++ b/src/panels/lovelace/hui-root.ts
@@ -28,6 +28,7 @@ import { computeRTLDirection } from "../../common/util/compute_rtl";
 import { debounce } from "../../common/util/debounce";
 import { afterNextRender } from "../../common/util/render-status";
 import "../../components/ha-icon";
+import "../../components/ha-menu-button";
 import "../../components/ha-paper-icon-button-arrow-next";
 import "../../components/ha-paper-icon-button-arrow-prev";
 import type { LovelaceConfig, LovelacePanelConfig } from "../../data/lovelace";
@@ -81,12 +82,17 @@ class HUIRoot extends LitElement {
 
   protected render(): TemplateResult {
     return html`
-    <ha-app-layout id="layout">
-      <app-header slot="header" effects="waterfall" class=${classMap({
-        "edit-mode": this._editMode,
-      })} fixed condenses>
-        ${
-          this._editMode
+      <ha-app-layout id="layout">
+        <app-header
+          slot="header"
+          effects="waterfall"
+          class=${classMap({
+            "edit-mode": this._editMode,
+          })}
+          fixed
+          condenses
+        >
+          ${this._editMode
             ? html`
                 <app-toolbar class="edit-mode">
                   <paper-icon-button
@@ -263,11 +269,8 @@ class HUIRoot extends LitElement {
                     </paper-listbox>
                   </paper-menu-button>
                 </app-toolbar>
-              `
-        }
-
-        ${
-          this.lovelace!.config.views.length > 1 || this._editMode
+              `}
+          ${this.lovelace!.config.views.length > 1 || this._editMode
             ? html`
                 <div sticky>
                   <paper-tabs
@@ -352,14 +355,17 @@ class HUIRoot extends LitElement {
                   </paper-tabs>
                 </div>
               `
-            : ""
-        }
-      </app-header>
-      <div id='view' class="${classMap({
-        "tabs-hidden":
-          !this._editMode && this.lovelace!.config.views.length < 2,
-      })}" @ll-rebuild='${this._debouncedConfigChanged}'></div>
-    </app-header-layout>
+            : ""}
+        </app-header>
+        <div
+          id="view"
+          class="${classMap({
+            "tabs-hidden":
+              !this._editMode && this.lovelace!.config.views.length < 2,
+          })}"
+          @ll-rebuild="${this._debouncedConfigChanged}"
+        ></div>
+      </ha-app-layout>
     `;
   }
 
diff --git a/src/panels/lovelace/special-rows/hui-cast-row.ts b/src/panels/lovelace/special-rows/hui-cast-row.ts
index 4b70d198fc..abfb00e6fa 100644
--- a/src/panels/lovelace/special-rows/hui-cast-row.ts
+++ b/src/panels/lovelace/special-rows/hui-cast-row.ts
@@ -1,3 +1,4 @@
+import "@material/mwc-button/mwc-button";
 import {
   css,
   CSSResult,
diff --git a/src/panels/lovelace/special-rows/hui-text-row.ts b/src/panels/lovelace/special-rows/hui-text-row.ts
index fac5b08046..f526070893 100644
--- a/src/panels/lovelace/special-rows/hui-text-row.ts
+++ b/src/panels/lovelace/special-rows/hui-text-row.ts
@@ -1,16 +1,14 @@
 import {
-  html,
-  LitElement,
-  TemplateResult,
-  customElement,
-  property,
   css,
   CSSResult,
+  customElement,
+  html,
+  LitElement,
+  property,
+  TemplateResult,
 } from "lit-element";
-
-import { LovelaceRow, TextConfig } from "../entity-rows/types";
-
 import "../../../components/ha-icon";
+import { LovelaceRow, TextConfig } from "../entity-rows/types";
 
 @customElement("hui-text-row")
 class HuiTextRow extends LitElement implements LovelaceRow {
diff --git a/src/panels/profile/ha-advanced-mode-row.ts b/src/panels/profile/ha-advanced-mode-row.ts
index c0d7942c70..77df00c329 100644
--- a/src/panels/profile/ha-advanced-mode-row.ts
+++ b/src/panels/profile/ha-advanced-mode-row.ts
@@ -8,11 +8,13 @@ import {
   TemplateResult,
 } from "lit-element";
 import "../../components/ha-card";
+import "../../components/ha-switch";
 import {
   CoreFrontendUserData,
   getOptimisticFrontendUserDataCollection,
 } from "../../data/frontend";
 import { HomeAssistant } from "../../types";
+import "./ha-settings-row";
 
 @customElement("ha-advanced-mode-row")
 class AdvancedModeRow extends LitElement {
diff --git a/src/state-summary/state-card-configurator.js b/src/state-summary/state-card-configurator.js
index 5029173578..38ced37982 100644
--- a/src/state-summary/state-card-configurator.js
+++ b/src/state-summary/state-card-configurator.js
@@ -3,9 +3,9 @@ import "@polymer/iron-flex-layout/iron-flex-layout-classes";
 import { html } from "@polymer/polymer/lib/utils/html-tag";
 /* eslint-plugin-disable lit */
 import { PolymerElement } from "@polymer/polymer/polymer-element";
+import { computeStateDisplay } from "../common/entity/compute_state_display";
 import "../components/entity/state-info";
 import LocalizeMixin from "../mixins/localize-mixin";
-import { computeStateDisplay } from "../common/entity/compute_state_display";
 
 /*
  * @appliesMixin LocalizeMixin
diff --git a/src/state-summary/state-card-media_player.js b/src/state-summary/state-card-media_player.js
index 457236bc84..164e1b52cb 100644
--- a/src/state-summary/state-card-media_player.js
+++ b/src/state-summary/state-card-media_player.js
@@ -2,10 +2,10 @@ import "@polymer/iron-flex-layout/iron-flex-layout-classes";
 import { html } from "@polymer/polymer/lib/utils/html-tag";
 /* eslint-plugin-disable lit */
 import { PolymerElement } from "@polymer/polymer/polymer-element";
+import { computeStateDisplay } from "../common/entity/compute_state_display";
 import "../components/entity/state-info";
 import LocalizeMixin from "../mixins/localize-mixin";
 import HassMediaPlayerEntity from "../util/hass-media-player-model";
-import { computeStateDisplay } from "../common/entity/compute_state_display";
 
 /*
  * @appliesMixin LocalizeMixin
diff --git a/src/state/translations-mixin.ts b/src/state/translations-mixin.ts
index 92fbde74ab..345f0d13d6 100644
--- a/src/state/translations-mixin.ts
+++ b/src/state/translations-mixin.ts
@@ -1,10 +1,12 @@
+import { atLeastVersion } from "../common/config/version";
 import { computeLocalize } from "../common/translations/localize";
 import { computeRTL } from "../common/util/compute_rtl";
+import { debounce } from "../common/util/debounce";
 import {
   getHassTranslations,
+  getHassTranslationsPre109,
   saveTranslationPreferences,
   TranslationCategory,
-  getHassTranslationsPre109,
 } from "../data/translation";
 import { translationMetadata } from "../resources/translations-metadata";
 import { Constructor, HomeAssistant } from "../types";
@@ -15,8 +17,6 @@ import {
   getUserLanguage,
 } from "../util/hass-translation";
 import { HassBaseEl } from "./hass-base-mixin";
-import { atLeastVersion } from "../common/config/version";
-import { debounce } from "../common/util/debounce";
 
 interface LoadedTranslationCategory {
   // individual integrations loaded for this category
diff --git a/src/types.ts b/src/types.ts
index 6a42dce227..6d06370b50 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -10,8 +10,8 @@ import {
 } from "home-assistant-js-websocket";
 import { LocalizeFunc } from "./common/translations/localize";
 import { CoreFrontendUserData } from "./data/frontend";
-import { ExternalMessaging } from "./external_app/external_messaging";
 import { getHassTranslations } from "./data/translation";
+import { ExternalMessaging } from "./external_app/external_messaging";
 
 declare global {
   /* eslint-disable no-var, no-redeclare */