Use border radius design tokens in codebase

cast/src/launcher/layout/hc-cast.ts

@@ -242,7 +242,7 @@ class HcCast extends LitElement {
     }
 
     .question:before {
-      border-radius: 4px;
+      border-radius: var(--ha-border-radius-sm);
       position: absolute;
       top: 0;
       right: 0;

cast/src/launcher/layout/hc-layout.ts

@@ -95,7 +95,8 @@ class HcLayout extends LitElement {
     }
 
     .hero {
-      border-radius: 4px 4px 0 0;
+      border-radius: var(--ha-border-radius-sm) var(--ha-border-radius-sm)
+        var(--ha-border-radius-square) var(--ha-border-radius-square);
     }
     .subtitle {
       font-size: var(--ha-font-size-m);

cast/src/media/entrypoint.ts

@@ -5,17 +5,17 @@ const castContext = framework.CastReceiverContext.getInstance();
 const playerManager = castContext.getPlayerManager();
 
 playerManager.setMessageInterceptor(
-  framework.messages.MessageType.LOAD,
+  "LOAD" as framework.messages.MessageType.LOAD,
   (loadRequestData) => {
     const media = loadRequestData.media;
     // Special handling if it came from Google Assistant
     if (media.entity) {
       media.contentId = media.entity;
-      media.streamType = framework.messages.StreamType.LIVE;
+      media.streamType = "LIVE" as framework.messages.StreamType.LIVE;
       media.contentType = "application/vnd.apple.mpegurl";
       // @ts-ignore
       media.hlsVideoSegmentFormat =
-        framework.messages.HlsVideoSegmentFormat.FMP4;
+        "fmp4" as framework.messages.HlsVideoSegmentFormat.FMP4;
     }
     return loadRequestData;
   }

cast/src/receiver/entrypoint.ts

@@ -40,7 +40,8 @@ const playDummyMedia = (viewTitle?: string) => {
   loadRequestData.media.contentId =
     "https://cast.home-assistant.io/images/google-nest-hub.png";
   loadRequestData.media.contentType = "image/jpeg";
-  loadRequestData.media.streamType = framework.messages.StreamType.NONE;
+  loadRequestData.media.streamType =
+    "NONE" as framework.messages.StreamType.NONE;
   const metadata = new framework.messages.GenericMediaMetadata();
   metadata.title = viewTitle;
   loadRequestData.media.metadata = metadata;
@@ -89,7 +90,7 @@ const showMediaPlayer = () => {
 const options = new framework.CastReceiverOptions();
 options.disableIdleTimeout = true;
 options.customNamespaces = {
-  [CAST_NS]: framework.system.MessageType.JSON,
+  [CAST_NS]: "json" as framework.system.MessageType.JSON,
 };
 
 castContext.addCustomMessageListener(
@@ -97,9 +98,7 @@ castContext.addCustomMessageListener(
   // @ts-ignore
   (ev: ReceivedMessage<HassMessage>) => {
     // We received a show Lovelace command, stop media from playing, hide media player and show Lovelace controller
-    if (
-      playerManager.getPlayerState() !== framework.messages.PlayerState.IDLE
-    ) {
+    if (playerManager.getPlayerState() !== "IDLE") {
       playerManager.stop();
     } else {
       showLovelaceController();
@@ -113,7 +112,7 @@ castContext.addCustomMessageListener(
 const playerManager = castContext.getPlayerManager();
 
 playerManager.setMessageInterceptor(
-  framework.messages.MessageType.LOAD,
+  "LOAD" as framework.messages.MessageType.LOAD,
   (loadRequestData) => {
     if (
       loadRequestData.media.contentId ===
@@ -127,24 +126,23 @@ playerManager.setMessageInterceptor(
     // Special handling if it came from Google Assistant
     if (media.entity) {
       media.contentId = media.entity;
-      media.streamType = framework.messages.StreamType.LIVE;
+      media.streamType = "LIVE" as framework.messages.StreamType.LIVE;
       media.contentType = "application/vnd.apple.mpegurl";
       // @ts-ignore
       media.hlsVideoSegmentFormat =
-        framework.messages.HlsVideoSegmentFormat.FMP4;
+        "fmp4" as framework.messages.HlsVideoSegmentFormat.FMP4;
     }
     return loadRequestData;
   }
 );
 
 playerManager.addEventListener(
-  framework.events.EventType.MEDIA_STATUS,
+  "MEDIA_STATUS" as framework.events.EventType.MEDIA_STATUS,
   (event) => {
     if (
-      event.mediaStatus?.playerState === framework.messages.PlayerState.IDLE &&
+      event.mediaStatus?.playerState === "IDLE" &&
       event.mediaStatus?.idleReason &&
-      event.mediaStatus?.idleReason !==
-        framework.messages.IdleReason.INTERRUPTED
+      event.mediaStatus?.idleReason !== "INTERRUPTED"
     ) {
       // media finished or stopped, return to default Lovelace
       showLovelaceController();

gallery/src/ha-gallery.ts

@@ -208,7 +208,7 @@ class HaGallery extends LitElement {
       }
 
       .sidebar a[active]::before {
-        border-radius: 12px;
+        border-radius: var(--ha-border-radius-lg);
         position: absolute;
         top: 0;
         right: 2px;
@@ -241,7 +241,7 @@ class HaGallery extends LitElement {
         text-align: center;
         margin: 16px;
         padding: 16px;
-        border-radius: 12px;
+        border-radius: var(--ha-border-radius-lg);
         background-color: var(--primary-background-color);
       }
 

gallery/src/pages/components/ha-control-button.ts

@@ -9,10 +9,10 @@ import { css, html, LitElement } from "lit";
 import { customElement } from "lit/decorators";
 import { ifDefined } from "lit/directives/if-defined";
 import { repeat } from "lit/directives/repeat";
-import "../../../../src/components/ha-control-button";
 import "../../../../src/components/ha-card";
-import "../../../../src/components/ha-svg-icon";
+import "../../../../src/components/ha-control-button";
 import "../../../../src/components/ha-control-button-group";
+import "../../../../src/components/ha-svg-icon";
 
 interface Button {
   label: string;
@@ -156,17 +156,17 @@ export class DemoHaBarButton extends LitElement {
       --control-button-icon-color: var(--primary-color);
       --control-button-background-color: var(--primary-color);
       --control-button-background-opacity: 0.2;
-      --control-button-border-radius: 18px;
+      --control-button-border-radius: var(--ha-border-radius-xl);
       height: 100px;
       width: 100px;
     }
     .custom-group {
       --control-button-group-thickness: 100px;
-      --control-button-group-border-radius: 36px;
+      --control-button-group-border-radius: var(--ha-border-radius-6xl);
       --control-button-group-spacing: 20px;
     }
     .custom-group ha-control-button {
-      --control-button-border-radius: 18px;
+      --control-button-border-radius: var(--ha-border-radius-xl);
       --mdc-icon-size: 32px;
     }
     .vertical-buttons {

gallery/src/pages/components/ha-control-number-buttons.ts

@@ -1,10 +1,10 @@
 import type { TemplateResult } from "lit";
 import { LitElement, css, html } from "lit";
 import { customElement, state } from "lit/decorators";
+import { ifDefined } from "lit/directives/if-defined";
+import { repeat } from "lit/directives/repeat";
 import "../../../../src/components/ha-card";
 import "../../../../src/components/ha-control-number-buttons";
-import { repeat } from "lit/directives/repeat";
-import { ifDefined } from "lit/directives/if-defined";
 
 const buttons: {
   id: string;
@@ -94,7 +94,7 @@ export class DemoHarControlNumberButtons extends LitElement {
       --control-number-buttons-background-color: #2196f3;
       --control-number-buttons-background-opacity: 0.1;
       --control-number-buttons-thickness: 100px;
-      --control-number-buttons-border-radius: 36px;
+      --control-number-buttons-border-radius: var(--ha-border-radius-6xl);
     }
   `;
 }

gallery/src/pages/components/ha-control-select-menu.ts

@@ -131,7 +131,7 @@ export class DemoHaControlSelectMenu extends LitElement {
       --control-button-icon-color: var(--primary-color);
       --control-button-background-color: var(--primary-color);
       --control-button-background-opacity: 0.2;
-      --control-button-border-radius: 18px;
+      --control-button-border-radius: var(--ha-border-radius-xl);
       height: 100px;
       width: 100px;
     }

gallery/src/pages/components/ha-control-select.ts

@@ -187,7 +187,7 @@ export class DemoHaControlSelect extends LitElement {
       --mdc-icon-size: 24px;
       --control-select-color: var(--state-fan-active-color);
       --control-select-thickness: 130px;
-      --control-select-border-radius: 36px;
+      --control-select-border-radius: var(--ha-border-radius-6xl);
     }
     .vertical-selects {
       height: 300px;

gallery/src/pages/components/ha-control-slider.ts

@@ -3,8 +3,8 @@ import { css, html, LitElement } from "lit";
 import { customElement, state } from "lit/decorators";
 import { ifDefined } from "lit/directives/if-defined";
 import { repeat } from "lit/directives/repeat";
-import "../../../../src/components/ha-control-slider";
 import "../../../../src/components/ha-card";
+import "../../../../src/components/ha-control-slider";
 
 const sliders: {
   id: string;
@@ -151,7 +151,7 @@ export class DemoHaBarSlider extends LitElement {
       --control-slider-background: #ffcf4c;
       --control-slider-background-opacity: 0.2;
       --control-slider-thickness: 130px;
-      --control-slider-border-radius: 36px;
+      --control-slider-border-radius: var(--ha-border-radius-6xl);
     }
     .vertical-sliders {
       height: 300px;

gallery/src/pages/components/ha-control-switch.ts

@@ -9,8 +9,8 @@ import { css, html, LitElement } from "lit";
 import { customElement, state } from "lit/decorators";
 import { ifDefined } from "lit/directives/if-defined";
 import { repeat } from "lit/directives/repeat";
-import "../../../../src/components/ha-control-switch";
 import "../../../../src/components/ha-card";
+import "../../../../src/components/ha-control-switch";
 
 const switches: {
   id: string;
@@ -118,7 +118,7 @@ export class DemoHaControlSwitch extends LitElement {
       --control-switch-on-color: var(--green-color);
       --control-switch-off-color: var(--red-color);
       --control-switch-thickness: 130px;
-      --control-switch-border-radius: 36px;
+      --control-switch-border-radius: var(--ha-border-radius-6xl);
       --control-switch-padding: 6px;
       --mdc-icon-size: 24px;
     }

gallery/src/pages/components/ha-select-box.ts

@@ -131,7 +131,7 @@ export class DemoHaSelectBox extends LitElement {
       --mdc-icon-size: 24px;
       --control-select-color: var(--state-fan-active-color);
       --control-select-thickness: 130px;
-      --control-select-border-radius: 36px;
+      --control-select-border-radius: var(--ha-border-radius-6xl);
     }
 
     p.title {

gallery/src/pages/components/ha-slider.ts

@@ -79,7 +79,7 @@ export class DemoHaSlider extends LitElement {
       background-color: var(--primary-background-color);
       padding: 0 50px;
       margin: 16px;
-      border-radius: 8px;
+      border-radius: var(--ha-border-radius-md);
     }
     ha-card {
       margin: 24px auto;

gallery/src/pages/components/ha-spinner.ts

@@ -61,7 +61,7 @@ export class DemoHaSpinner extends LitElement {
       background-color: var(--primary-background-color);
       padding: 0 50px;
       margin: 16px;
-      border-radius: 8px;
+      border-radius: var(--ha-border-radius-md);
     }
     ha-card {
       margin: 24px auto;

gallery/src/pages/misc/entity-state.ts

@@ -5,13 +5,13 @@ import type {
 import { css, html, LitElement, nothing } from "lit";
 import { customElement, property } from "lit/decorators";
 import memoizeOne from "memoize-one";
+import { mockIcons } from "../../../../demo/src/stubs/icons";
 import { computeDomain } from "../../../../src/common/entity/compute_domain";
 import { computeStateDisplay } from "../../../../src/common/entity/compute_state_display";
 import "../../../../src/components/data-table/ha-data-table";
 import type { DataTableColumnContainer } from "../../../../src/components/data-table/ha-data-table";
 import "../../../../src/components/entity/state-badge";
 import { provideHass } from "../../../../src/fake_data/provide_hass";
-import { mockIcons } from "../../../../demo/src/stubs/icons";
 import type { HomeAssistant } from "../../../../src/types";
 
 const SENSOR_DEVICE_CLASSES = [
@@ -434,7 +434,7 @@ export class DemoEntityState extends LitElement {
       display: block;
       height: 20px;
       width: 20px;
-      border-radius: 10px;
+      border-radius: var(--ha-border-radius-md);
       background-color: rgb(--color);
     }
   `;

hassio/src/components/hassio-card-content.ts

@@ -121,7 +121,7 @@ class HassioCardContent extends LitElement {
       height: 12px;
       top: 8px;
       right: 8px;
-      border-radius: 50%;
+      border-radius: var(--ha-border-radius-circle);
     }
     .topbar {
       position: absolute;

hassio/src/dialogs/hardware/dialog-hassio-hardware.ts

@@ -164,7 +164,7 @@ class HassioHardwareDialog extends LitElement {
         pre,
         code {
           background-color: var(--markdown-code-background-color, none);
-          border-radius: 3px;
+          border-radius: var(--ha-border-radius-sm);
         }
         pre {
           padding: 16px;

hassio/src/dialogs/registries/dialog-hassio-registries.ts

@@ -228,7 +228,7 @@ class HassioRegistriesDialog extends LitElement {
       css`
         .registry {
           border: 1px solid var(--divider-color);
-          border-radius: 4px;
+          border-radius: var(--ha-border-radius-sm);
           margin-top: 4px;
         }
         .action {

hassio/src/dialogs/repositories/dialog-hassio-repositories.ts

@@ -193,7 +193,7 @@ class HassioRepositoriesDialog extends LitElement {
         }
         .option {
           border: 1px solid var(--divider-color);
-          border-radius: 4px;
+          border-radius: var(--ha-border-radius-sm);
           margin-top: 4px;
         }
         ha-button {

landing-page/src/components/landing-page-logs.ts

@@ -302,7 +302,7 @@ class LandingPageLogs extends LitElement {
         max-height: 300px;
         overflow: auto;
         border: 1px solid var(--divider-color);
-        border-radius: 4px;
+        border-radius: var(--ha-border-radius-sm);
         padding: 4px;
       }
 

landing-page/src/ha-landing-page.ts

@@ -221,7 +221,7 @@ class HaLandingPage extends LandingPageBaseElement {
       ha-language-picker {
         display: block;
         width: 200px;
-        border-radius: 4px;
+        border-radius: var(--ha-border-radius-sm);
         overflow: hidden;
         --ha-select-height: 40px;
         --mdc-select-fill-color: none;

package.json

@@ -34,7 +34,7 @@
     "@codemirror/legacy-modes": "6.5.1",
     "@codemirror/search": "6.5.11",
     "@codemirror/state": "6.5.2",
-    "@codemirror/view": "6.38.3",
+    "@codemirror/view": "6.38.2",
     "@date-fns/tz": "1.4.1",
     "@egjs/hammerjs": "2.0.17",
     "@formatjs/intl-datetimeformat": "6.18.0",
@@ -111,7 +111,7 @@
     "fuse.js": "7.1.0",
     "google-timezones-json": "1.2.0",
     "gulp-zopfli-green": "6.0.2",
-    "hls.js": "1.6.13",
+    "hls.js": "1.6.12",
     "home-assistant-js-websocket": "9.5.0",
     "idb-keyval": "6.2.2",
     "intl-messageformat": "10.7.16",
@@ -158,10 +158,10 @@
     "@octokit/plugin-retry": "8.0.1",
     "@octokit/rest": "22.0.0",
     "@rsdoctor/rspack-plugin": "1.2.3",
-    "@rspack/core": "1.5.6",
+    "@rspack/core": "1.5.5",
     "@rspack/dev-server": "1.1.4",
     "@types/babel__plugin-transform-runtime": "7.9.5",
-    "@types/chromecast-caf-receiver": "6.0.22",
+    "@types/chromecast-caf-receiver": "6.0.24",
     "@types/chromecast-caf-sender": "1.0.11",
     "@types/color-name": "2.0.0",
     "@types/culori": "4.0.1",
@@ -203,7 +203,7 @@
     "husky": "9.1.7",
     "jsdom": "27.0.0",
     "jszip": "3.10.1",
-    "lint-staged": "16.2.0",
+    "lint-staged": "16.1.6",
     "lit-analyzer": "2.0.3",
     "lodash.merge": "4.6.2",
     "lodash.template": "4.5.0",
@@ -217,7 +217,7 @@
     "terser-webpack-plugin": "5.3.14",
     "ts-lit-plugin": "2.0.2",
     "typescript": "5.9.2",
-    "typescript-eslint": "8.44.1",
+    "typescript-eslint": "8.44.0",
     "vite-tsconfig-paths": "5.1.4",
     "vitest": "3.2.4",
     "webpack-stats-plugin": "1.1.3",

src/auth/ha-authorize.ts

@@ -103,7 +103,10 @@ export class HaAuthorize extends litLocalizeLiteMixin(LitElement) {
           );
           box-shadow: var(--ha-card-box-shadow, none);
           box-sizing: border-box;
-          border-radius: var(--ha-card-border-radius, 12px);
+          border-radius: var(
+            --ha-card-border-radius,
+            var(--ha-border-radius-lg)
+          );
           border-width: var(--ha-card-border-width, 1px);
           border-style: solid;
           border-color: var(
@@ -132,7 +135,7 @@ export class HaAuthorize extends litLocalizeLiteMixin(LitElement) {
         }
         ha-language-picker {
           width: 200px;
-          border-radius: 4px;
+          border-radius: var(--ha-border-radius-sm);
           overflow: hidden;
           --ha-select-height: 40px;
           --mdc-select-fill-color: none;

src/components/chart/ha-chart-base.ts

@@ -1,5 +1,5 @@
-import { consume } from "@lit/context";
 import { ResizeController } from "@lit-labs/observers/resize-controller";
+import { consume } from "@lit/context";
 import { mdiChevronDown, mdiChevronUp, mdiRestart } from "@mdi/js";
 import { differenceInMinutes } from "date-fns";
 import type { DataZoomComponentOption } from "echarts/components";
@@ -7,15 +7,16 @@ import type { EChartsType } from "echarts/core";
 import type {
   ECElementEvent,
   LegendComponentOption,
+  LineSeriesOption,
   XAXisOption,
   YAXisOption,
-  LineSeriesOption,
 } from "echarts/types/dist/shared";
 import type { PropertyValues } from "lit";
 import { css, html, LitElement, nothing } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import { classMap } from "lit/directives/class-map";
 import { styleMap } from "lit/directives/style-map";
+import { ensureArray } from "../../common/array/ensure-array";
 import { getAllGraphColors } from "../../common/color/colors";
 import { fireEvent } from "../../common/dom/fire_event";
 import { listenMediaQuery } from "../../common/dom/media_query";
@@ -24,10 +25,9 @@ import type { Themes } from "../../data/ws-themes";
 import type { ECOption } from "../../resources/echarts";
 import type { HomeAssistant } from "../../types";
 import { isMac } from "../../util/is_mac";
+import "../chips/ha-assist-chip";
 import "../ha-icon-button";
 import { formatTimeLabel } from "./axis-label";
-import { ensureArray } from "../../common/array/ensure-array";
-import "../chips/ha-assist-chip";
 import { downSampleLineData } from "./down-sample";
 
 export const MIN_TIME_BETWEEN_UPDATES = 60 * 5 * 1000;
@@ -983,7 +983,7 @@ export class HaChartBase extends LitElement {
     .chart-controls ha-icon-button,
     .chart-controls ::slotted(ha-icon-button) {
       background: var(--card-background-color);
-      border-radius: 4px;
+      border-radius: var(--ha-border-radius-sm);
       --mdc-icon-button-size: 32px;
       color: var(--primary-color);
       border: 1px solid var(--divider-color);
@@ -1036,7 +1036,7 @@ export class HaChartBase extends LitElement {
     .chart-legend .bullet {
       border-width: 1px;
       border-style: solid;
-      border-radius: 50%;
+      border-radius: var(--ha-border-radius-circle);
       display: block;
       height: 16px;
       width: 16px;

src/components/data-table/dialog-data-table-settings.ts

@@ -290,7 +290,9 @@ export class DialogDataTableSettings extends LitElement {
           ha-dialog {
             --vertical-align-dialog: flex-start;
             --dialog-surface-margin-top: 250px;
-            --ha-dialog-border-radius: 28px 28px 0 0;
+            --ha-dialog-border-radius: var(--ha-border-radius-4xl)
+              var(--ha-border-radius-4xl) var(--ha-border-radius-square)
+              var(--ha-border-radius-square);
             --mdc-dialog-min-height: calc(100% - 250px);
             --mdc-dialog-max-height: calc(100% - 250px);
           }

src/components/data-table/ha-data-table.ts

@@ -1053,7 +1053,7 @@ export class HaDataTable extends LitElement {
 
         .mdc-data-table {
           background-color: var(--data-table-background-color);
-          border-radius: 4px;
+          border-radius: var(--ha-border-radius-sm);
           border-width: 1px;
           border-style: solid;
           border-color: var(--divider-color);

src/components/date-range-picker.ts

@@ -4,11 +4,11 @@ import Vue from "vue";
 import DateRangePicker from "vue2-daterange-picker";
 // @ts-ignore
 import dateRangePickerStyles from "vue2-daterange-picker/dist/vue2-daterange-picker.css";
-import { fireEvent } from "../common/dom/fire_event";
 import {
-  localizeWeekdays,
   localizeMonths,
+  localizeWeekdays,
 } from "../common/datetime/localize_date";
+import { fireEvent } from "../common/dom/fire_event";
 import { mainWindow } from "../common/dom/get_main_window";
 
 // eslint-disable-next-line @typescript-eslint/naming-convention
@@ -177,7 +177,7 @@ class DateRangePickerElement extends WrappedElement {
             top: auto;
             box-shadow: var(--ha-card-box-shadow, none);
             background-color: var(--card-background-color);
-            border-radius: var(--ha-card-border-radius, 12px);
+            border-radius: var(--ha-card-border-radius, var(--ha-border-radius-lg));
             border-width: var(--ha-card-border-width, 1px);
             border-style: solid;
             border-color: var(
@@ -203,7 +203,7 @@ class DateRangePickerElement extends WrappedElement {
           .daterangepicker .calendar-table th {
             background-color: transparent;
             color: var(--secondary-text-color);
-            border-radius: 0;
+            border-radius: var(--ha-border-radius-square);
             outline: none;
             min-width: 32px;
             height: 32px;
@@ -225,13 +225,13 @@ class DateRangePickerElement extends WrappedElement {
             color: var(--text-primary-color);
           }
           .daterangepicker td.start-date.end-date {
-            border-radius: 50%;
+            border-radius: var(--ha-border-radius-circle);
           }
           .daterangepicker td.start-date {
-            border-radius: 50% 0 0 50%;
+            border-radius: var(--ha-border-radius-circle) var(--ha-border-radius-square) var(--ha-border-radius-square) var(--ha-border-radius-circle);
           }
           .daterangepicker td.end-date {
-            border-radius: 0 50% 50% 0;
+            border-radius: var(--ha-border-radius-square) var(--ha-border-radius-circle) var(--ha-border-radius-circle) var(--ha-border-radius-square);
           }
           .reportrange-text {
             background: none !important;
@@ -265,7 +265,7 @@ class DateRangePickerElement extends WrappedElement {
             border: 1px solid var(--primary-color);
             background-color: transparent;
             color: var(--primary-color);
-            border-radius: 4px;
+            border-radius: var(--ha-border-radius-sm);
             padding: 8px;
             cursor: pointer;
           }
@@ -321,10 +321,10 @@ class DateRangePickerElement extends WrappedElement {
               -webkit-transform: rotate(-45deg);
             }
             .daterangepicker td.start-date {
-              border-radius: 0 50% 50% 0;
+              border-radius: var(--ha-border-radius-square) var(--ha-border-radius-circle) var(--ha-border-radius-circle) var(--ha-border-radius-square);
             }
             .daterangepicker td.end-date {
-              border-radius: 50% 0 0 50%;
+              border-radius: var(--ha-border-radius-circle) var(--ha-border-radius-square) var(--ha-border-radius-square) var(--ha-border-radius-circle);
             }
             `;
     }

src/components/entity/state-badge.ts

@@ -236,7 +236,7 @@ export class StateBadge extends LitElement {
           border-radius: var(--state-badge-with-media-image-border-radius, 8%);
         }
         :host(.has-no-radius) {
-          border-radius: 0;
+          border-radius: var(--ha-border-radius-square);
         }
         :host(:focus) {
           outline: none;

src/components/ha-alert.ts

@@ -99,7 +99,7 @@ class HaAlert extends LitElement {
       opacity: 0.12;
       pointer-events: none;
       content: "";
-      border-radius: 4px;
+      border-radius: var(--ha-border-radius-sm);
     }
     .icon.no-title {
       align-self: center;

src/components/ha-analytics.ts

@@ -1,5 +1,5 @@
 import type { CSSResultGroup, TemplateResult } from "lit";
-import { css, html, LitElement, nothing } from "lit";
+import { css, html, LitElement } from "lit";
 import { customElement, property } from "lit/decorators";
 import { fireEvent } from "../common/dom/fire_event";
 import type { LocalizeFunc } from "../common/translations/localize";
@@ -73,18 +73,14 @@ export class HaAnalytics extends LitElement {
                 .checked=${this.analytics?.preferences[preference]}
                 .preference=${preference}
                 name=${preference}
+                ?disabled=${baseEnabled}
               >
               </ha-switch>
-              ${baseEnabled
-                ? nothing
-                : html`<ha-tooltip
-                    .for="switch-${preference}"
-                    placement="right"
-                  >
-                    ${this.localize(
-                      `ui.panel.${this.translationKeyPanel}.analytics.need_base_enabled`
-                    )}
-                  </ha-tooltip>`}
+              <ha-tooltip .for="switch-${preference}" placement="right">
+                ${this.localize(
+                  `ui.panel.${this.translationKeyPanel}.analytics.need_base_enabled`
+                )}
+              </ha-tooltip>
             </span>
           </ha-settings-row>
         `

src/components/ha-assist-chat.ts

@@ -1,24 +1,24 @@
-import type { PropertyValues, TemplateResult } from "lit";
-import { css, LitElement, html, nothing } from "lit";
 import { mdiAlertCircle, mdiMicrophone, mdiSend } from "@mdi/js";
+import type { PropertyValues, TemplateResult } from "lit";
+import { css, html, LitElement, nothing } from "lit";
 import { customElement, property, query, state } from "lit/decorators";
 import { classMap } from "lit/directives/class-map";
-import type { HomeAssistant } from "../types";
+import { supportsFeature } from "../common/entity/supports-feature";
 import {
-  type PipelineRunEvent,
   runAssistPipeline,
   type AssistPipeline,
   type ConversationChatLogAssistantDelta,
   type ConversationChatLogToolResultDelta,
+  type PipelineRunEvent,
 } from "../data/assist_pipeline";
-import { supportsFeature } from "../common/entity/supports-feature";
 import { ConversationEntityFeature } from "../data/conversation";
+import { showAlertDialog } from "../dialogs/generic/show-dialog-box";
+import type { HomeAssistant } from "../types";
 import { AudioRecorder } from "../util/audio-recorder";
+import { documentationUrl } from "../util/documentation-url";
 import "./ha-alert";
 import "./ha-textfield";
 import type { HaTextField } from "./ha-textfield";
-import { documentationUrl } from "../util/documentation-url";
-import { showAlertDialog } from "../dialogs/generic/show-dialog-box";
 
 interface AssistMessage {
   who: string;
@@ -591,7 +591,7 @@ export class HaAssistChat extends LitElement {
       clear: both;
       margin: 8px 0;
       padding: 8px;
-      border-radius: 15px;
+      border-radius: var(--ha-border-radius-xl);
     }
     .message:last-child {
       margin-bottom: 0;
@@ -659,7 +659,7 @@ export class HaAssistChat extends LitElement {
     .double-bounce2 {
       width: 48px;
       height: 48px;
-      border-radius: 50%;
+      border-radius: var(--ha-border-radius-circle);
       background-color: var(--primary-color);
       opacity: 0.2;
       position: absolute;

src/components/ha-badge.ts

@@ -122,7 +122,7 @@ export class HaBadge extends LitElement {
     ::slotted(img[slot="icon"]) {
       width: 30px;
       height: 30px;
-      border-radius: 50%;
+      border-radius: var(--ha-border-radius-circle);
       object-fit: cover;
       overflow: hidden;
       margin-left: -10px;

src/components/ha-bar.ts

@@ -46,7 +46,7 @@ export class HaBar extends LitElement {
       fill: var(--ha-bar-primary-color, var(--primary-color));
     }
     svg {
-      border-radius: var(--ha-bar-border-radius, 4px);
+      border-radius: var(--ha-bar-border-radius, var(--ha-border-radius-sm));
       height: 12px;
       width: 100%;
     }

src/components/ha-base-time-input.ts

@@ -337,7 +337,9 @@ export class HaBaseTimeInput extends LitElement {
     .time-input-wrap {
       display: flex;
       flex: var(--time-input-flex, unset);
-      border-radius: var(--mdc-shape-small, 4px) var(--mdc-shape-small, 4px) 0 0;
+      border-radius: var(--mdc-shape-small, var(--ha-border-radius-sm))
+        var(--mdc-shape-small, var(--ha-border-radius-sm))
+        var(--ha-border-radius-square) var(--ha-border-radius-square);
       overflow: hidden;
       position: relative;
       direction: ltr;

src/components/ha-bottom-sheet.ts

@@ -54,9 +54,9 @@ export class HaBottomSheet extends LitElement {
       border-top-left-radius: var(--ha-border-radius-lg);
       border-top-right-radius: var(--ha-border-radius-lg);
       max-height: 90vh;
-      padding-bottom: var(--safe-area-inset-bottom);
-      padding-left: var(--safe-area-inset-left);
-      padding-right: var(--safe-area-inset-right);
+      margin-bottom: var(--safe-area-inset-bottom);
+      margin-left: var(--safe-area-inset-left);
+      margin-right: var(--safe-area-inset-right);
     }
   `;
 }

src/components/ha-card.ts

@@ -17,7 +17,7 @@ export class HaCard extends LitElement {
       backdrop-filter: var(--ha-card-backdrop-filter, none);
       box-shadow: var(--ha-card-box-shadow, none);
       box-sizing: border-box;
-      border-radius: var(--ha-card-border-radius, 12px);
+      border-radius: var(--ha-card-border-radius, var(--ha-border-radius-lg));
       border-width: var(--ha-card-border-width, 1px);
       border-style: solid;
       border-color: var(--ha-card-border-color, var(--divider-color, #e0e0e0));

src/components/ha-code-editor-completion-items.ts

@@ -45,7 +45,7 @@ export class HaCodeEditorCompletionItems extends LitElement {
       margin: 0 3px;
       padding: 3px;
       background-color: var(--markdown-code-background-color, none);
-      border-radius: var(--ha-border-radius-sm, 4px);
+      border-radius: var(--ha-border-radius-sm);
       line-height: var(--ha-line-height-condensed);
     }
   `;

src/components/ha-code-editor.ts

@@ -5,19 +5,19 @@ import type {
   CompletionResult,
   CompletionSource,
 } from "@codemirror/autocomplete";
-import { undo, undoDepth, redo, redoDepth } from "@codemirror/commands";
+import { redo, redoDepth, undo, undoDepth } from "@codemirror/commands";
 import type { Extension, TransactionSpec } from "@codemirror/state";
 import type { EditorView, KeyBinding, ViewUpdate } from "@codemirror/view";
 import {
-  mdiArrowExpand,
   mdiArrowCollapse,
+  mdiArrowExpand,
   mdiContentCopy,
-  mdiUndo,
   mdiRedo,
+  mdiUndo,
 } from "@mdi/js";
 import type { HassEntities } from "home-assistant-js-websocket";
 import type { PropertyValues } from "lit";
-import { css, ReactiveElement, html, render } from "lit";
+import { css, html, ReactiveElement, render } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import memoizeOne from "memoize-one";
 import { fireEvent } from "../common/dom/fire_event";
@@ -774,7 +774,7 @@ export class HaCodeEditor extends ReactiveElement {
       right: 8px !important;
       bottom: 8px !important;
       z-index: 6;
-      border-radius: 12px !important;
+      border-radius: var(--ha-border-radius-lg) !important;
       box-shadow: 0 2px 10px rgba(0, 0, 0, 0.3) !important;
       overflow: hidden !important;
       background-color: var(
@@ -797,7 +797,7 @@ export class HaCodeEditor extends ReactiveElement {
     :host(.fullscreen) .cm-editor {
       height: 100% !important;
       max-height: 100% !important;
-      border-radius: 0 !important;
+      border-radius: var(--ha-border-radius-square) !important;
     }
 
     :host(:not(.hasToolbar)) .code-editor-toolbar {

src/components/ha-color-picker.ts

@@ -155,7 +155,7 @@ export class HaColorPicker extends LitElement {
       display: block;
       background-color: var(--circle-color, var(--divider-color));
       border: 1px solid var(--outline-color);
-      border-radius: 10px;
+      border-radius: var(--ha-border-radius-pill);
       width: 20px;
       height: 20px;
       box-sizing: border-box;

src/components/ha-control-button.ts

@@ -32,7 +32,7 @@ export class HaControlButton extends LitElement {
       --control-button-icon-color: var(--primary-text-color);
       --control-button-background-color: var(--disabled-color);
       --control-button-background-opacity: 0.2;
-      --control-button-border-radius: 10px;
+      --control-button-border-radius: var(--ha-border-radius-md);
       --control-button-padding: 8px;
       --mdc-icon-size: 20px;
       --ha-ripple-color: var(--secondary-text-color);

src/components/ha-control-number-buttons.ts

@@ -187,7 +187,7 @@ export class HaControlNumberButton extends LitElement {
       --control-number-buttons-focus-color: var(--secondary-text-color);
       --control-number-buttons-background-color: var(--disabled-color);
       --control-number-buttons-background-opacity: 0.2;
-      --control-number-buttons-border-radius: 10px;
+      --control-number-buttons-border-radius: var(--ha-border-radius-md);
       --mdc-icon-size: 16px;
       height: var(--feature-height);
       width: 100%;

src/components/ha-control-select-menu.ts

@@ -174,7 +174,7 @@ export class HaControlSelectMenu extends SelectBase {
         --control-select-menu-text-color: var(--primary-text-color);
         --control-select-menu-background-color: var(--disabled-color);
         --control-select-menu-background-opacity: 0.2;
-        --control-select-menu-border-radius: 14px;
+        --control-select-menu-border-radius: var(--ha-border-radius-lg);
         --control-select-menu-height: 48px;
         --control-select-menu-padding: 6px 10px;
         --mdc-icon-size: 20px;

src/components/ha-control-slider.ts

@@ -380,7 +380,7 @@ export class HaControlSlider extends LitElement {
       --control-slider-background: var(--disabled-color);
       --control-slider-background-opacity: 0.2;
       --control-slider-thickness: 40px;
-      --control-slider-border-radius: 10px;
+      --control-slider-border-radius: var(--ha-border-radius-md);
       --control-slider-tooltip-font-size: var(--ha-font-size-m);
       height: var(--control-slider-thickness);
       width: 100%;
@@ -403,7 +403,7 @@ export class HaControlSlider extends LitElement {
       background-color: var(--clear-background-color);
       color: var(--primary-text-color);
       font-size: var(--control-slider-tooltip-font-size);
-      border-radius: 0.8em;
+      border-radius: var(--ha-border-radius-lg);
       padding: 0.2em 0.4em;
       opacity: 0;
       white-space: nowrap;

src/components/ha-control-switch.ts

@@ -157,7 +157,7 @@ export class HaControlSwitch extends LitElement {
       --control-switch-off-color: var(--disabled-color);
       --control-switch-background-opacity: 0.2;
       --control-switch-thickness: 40px;
-      --control-switch-border-radius: 12px;
+      --control-switch-border-radius: var(--ha-border-radius-lg);
       --control-switch-padding: 4px;
       --mdc-icon-size: 20px;
       height: var(--control-switch-thickness);

src/components/ha-dialog.ts

@@ -123,7 +123,10 @@ export class HaDialog extends DialogBase {
         margin-top: var(--dialog-surface-margin-top);
         min-width: var(--mdc-dialog-min-width, 100vw);
         min-height: var(--mdc-dialog-min-height, auto);
-        border-radius: var(--ha-dialog-border-radius, 24px);
+        border-radius: var(
+          --ha-dialog-border-radius,
+          var(--ha-border-radius-3xl)
+        );
         -webkit-backdrop-filter: var(--ha-dialog-surface-backdrop-filter, none);
         backdrop-filter: var(--ha-dialog-surface-backdrop-filter, none);
         background: var(

src/components/ha-expansion-panel.ts

@@ -144,7 +144,7 @@ export class HaExpansionPanel extends LitElement {
     .top {
       display: flex;
       align-items: center;
-      border-radius: var(--ha-card-border-radius, 12px);
+      border-radius: var(--ha-card-border-radius, var(--ha-border-radius-lg));
     }
 
     .top.expanded {
@@ -161,7 +161,7 @@ export class HaExpansionPanel extends LitElement {
       border-width: 1px;
       border-style: solid;
       border-color: var(--outline-color);
-      border-radius: var(--ha-card-border-radius, 12px);
+      border-radius: var(--ha-card-border-radius, var(--ha-border-radius-lg));
     }
 
     .summary-icon {

src/components/ha-file-upload.ts

@@ -242,7 +242,7 @@ export class HaFileUpload extends LitElement {
       align-items: center;
       border: solid 1px
         var(--mdc-text-field-idle-line-color, rgba(0, 0, 0, 0.42));
-      border-radius: var(--mdc-shape-small, 4px);
+      border-radius: var(--mdc-shape-small, var(--ha-border-radius-sm));
       height: 100%;
     }
     .row {

src/components/ha-filter-blueprints.ts

@@ -4,6 +4,7 @@ import type { CSSResultGroup, PropertyValues } from "lit";
 import { css, html, LitElement, nothing } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import { fireEvent } from "../common/dom/fire_event";
+import { deepEqual } from "../common/util/deep-equal";
 import type { Blueprints } from "../data/blueprint";
 import { fetchBlueprints } from "../data/blueprint";
 import type { RelatedResult } from "../data/search";
@@ -14,7 +15,6 @@ import "./ha-check-list-item";
 import "./ha-expansion-panel";
 import "./ha-icon-button";
 import "./ha-list";
-import { deepEqual } from "../common/util/deep-equal";
 
 @customElement("ha-filter-blueprints")
 export class HaFilterBlueprints extends LitElement {
@@ -189,7 +189,7 @@ export class HaFilterBlueprints extends LitElement {
           height: 0;
         }
         ha-expansion-panel {
-          --ha-card-border-radius: 0;
+          --ha-card-border-radius: var(--ha-border-radius-square);
           --expansion-panel-content-padding: 0;
         }
         .header {
@@ -207,7 +207,7 @@ export class HaFilterBlueprints extends LitElement {
           margin-inline-end: 0;
           min-width: 16px;
           box-sizing: border-box;
-          border-radius: 50%;
+          border-radius: var(--ha-border-radius-circle);
           font-size: var(--ha-font-size-xs);
           font-weight: var(--ha-font-weight-normal);
           background-color: var(--primary-color);

src/components/ha-filter-categories.ts

@@ -12,6 +12,7 @@ import type { CSSResultGroup } from "lit";
 import { LitElement, css, html, nothing } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import { fireEvent } from "../common/dom/fire_event";
+import { stopPropagation } from "../common/dom/stop_propagation";
 import type { CategoryRegistryEntry } from "../data/category_registry";
 import {
   createCategoryRegistryEntry,
@@ -24,12 +25,11 @@ import { SubscribeMixin } from "../mixins/subscribe-mixin";
 import { showCategoryRegistryDetailDialog } from "../panels/config/category/show-dialog-category-registry-detail";
 import { haStyleScrollbar } from "../resources/styles";
 import type { HomeAssistant } from "../types";
+import "./ha-button-menu";
 import "./ha-expansion-panel";
 import "./ha-icon";
-import "./ha-button-menu";
-import "./ha-list-item";
 import "./ha-list";
-import { stopPropagation } from "../common/dom/stop_propagation";
+import "./ha-list-item";
 
 @customElement("ha-filter-categories")
 export class HaFilterCategories extends SubscribeMixin(LitElement) {
@@ -284,7 +284,7 @@ export class HaFilterCategories extends SubscribeMixin(LitElement) {
           height: 0;
         }
         ha-expansion-panel {
-          --ha-card-border-radius: 0;
+          --ha-card-border-radius: var(--ha-border-radius-square);
           --expansion-panel-content-padding: 0;
         }
         .header {
@@ -302,7 +302,7 @@ export class HaFilterCategories extends SubscribeMixin(LitElement) {
           margin-inline-end: 0;
           min-width: 16px;
           box-sizing: border-box;
-          border-radius: 50%;
+          border-radius: var(--ha-border-radius-circle);
           font-size: var(--ha-font-size-xs);
           font-weight: var(--ha-font-weight-normal);
           background-color: var(--primary-color);

src/components/ha-filter-devices.ts

@@ -216,7 +216,7 @@ export class HaFilterDevices extends LitElement {
         }
 
         ha-expansion-panel {
-          --ha-card-border-radius: 0;
+          --ha-card-border-radius: var(--ha-border-radius-square);
           --expansion-panel-content-padding: 0;
         }
         .header {
@@ -234,7 +234,7 @@ export class HaFilterDevices extends LitElement {
           margin-inline-end: 0;
           min-width: 16px;
           box-sizing: border-box;
-          border-radius: 50%;
+          border-radius: var(--ha-border-radius-circle);
           font-size: var(--ha-font-size-xs);
           font-weight: var(--ha-font-weight-normal);
           background-color: var(--primary-color);

src/components/ha-filter-domains.ts

@@ -170,7 +170,7 @@ export class HaFilterDomains extends LitElement {
           height: 0;
         }
         ha-expansion-panel {
-          --ha-card-border-radius: 0;
+          --ha-card-border-radius: var(--ha-border-radius-square);
           --expansion-panel-content-padding: 0;
         }
         .header {
@@ -188,7 +188,7 @@ export class HaFilterDomains extends LitElement {
           margin-inline-end: initial;
           min-width: 16px;
           box-sizing: border-box;
-          border-radius: 50%;
+          border-radius: var(--ha-border-radius-circle);
           font-size: var(--ha-font-size-xs);
           font-weight: var(--ha-font-weight-normal);
           background-color: var(--primary-color);

src/components/ha-filter-entities.ts

@@ -7,6 +7,7 @@ import { fireEvent } from "../common/dom/fire_event";
 import { computeStateDomain } from "../common/entity/compute_state_domain";
 import { computeStateName } from "../common/entity/compute_state_name";
 import { stringCompare } from "../common/string/compare";
+import { deepEqual } from "../common/util/deep-equal";
 import type { RelatedResult } from "../data/search";
 import { findRelated } from "../data/search";
 import { haStyleScrollbar } from "../resources/styles";
@@ -17,7 +18,6 @@ import "./ha-expansion-panel";
 import "./ha-list";
 import "./ha-state-icon";
 import "./search-input-outlined";
-import { deepEqual } from "../common/util/deep-equal";
 
 @customElement("ha-filter-entities")
 export class HaFilterEntities extends LitElement {
@@ -231,7 +231,7 @@ export class HaFilterEntities extends LitElement {
           height: 0;
         }
         ha-expansion-panel {
-          --ha-card-border-radius: 0;
+          --ha-card-border-radius: var(--ha-border-radius-square);
           --expansion-panel-content-padding: 0;
         }
         .header {
@@ -249,7 +249,7 @@ export class HaFilterEntities extends LitElement {
           margin-inline-end: 0;
           min-width: 16px;
           box-sizing: border-box;
-          border-radius: 50%;
+          border-radius: var(--ha-border-radius-circle);
           font-size: var(--ha-font-size-xs);
           font-weight: var(--ha-font-weight-normal);
           background-color: var(--primary-color);

src/components/ha-filter-floor-areas.ts

@@ -7,6 +7,7 @@ import { repeat } from "lit/directives/repeat";
 import memoizeOne from "memoize-one";
 import { fireEvent } from "../common/dom/fire_event";
 import { computeRTL } from "../common/util/compute_rtl";
+import { deepEqual } from "../common/util/deep-equal";
 import { getFloorAreaLookup } from "../data/floor_registry";
 import type { RelatedResult } from "../data/search";
 import { findRelated } from "../data/search";
@@ -20,7 +21,6 @@ import "./ha-icon-button";
 import "./ha-list";
 import "./ha-svg-icon";
 import "./ha-tree-indicator";
-import { deepEqual } from "../common/util/deep-equal";
 
 @customElement("ha-filter-floor-areas")
 export class HaFilterFloorAreas extends LitElement {
@@ -281,7 +281,7 @@ export class HaFilterFloorAreas extends LitElement {
           height: 0;
         }
         ha-expansion-panel {
-          --ha-card-border-radius: 0;
+          --ha-card-border-radius: var(--ha-border-radius-square);
           --expansion-panel-content-padding: 0;
         }
         .header {
@@ -299,7 +299,7 @@ export class HaFilterFloorAreas extends LitElement {
           margin-inline-end: 0;
           min-width: 16px;
           box-sizing: border-box;
-          border-radius: 50%;
+          border-radius: var(--ha-border-radius-circle);
           font-size: var(--ha-font-size-xs);
           font-weight: var(--ha-font-weight-normal);
           background-color: var(--primary-color);

src/components/ha-filter-integrations.ts

@@ -8,7 +8,7 @@ import { fireEvent } from "../common/dom/fire_event";
 import { stringCompare } from "../common/string/compare";
 import type { LocalizeFunc } from "../common/translations/localize";
 import type { IntegrationManifest } from "../data/integration";
-import { fetchIntegrationManifests, domainToName } from "../data/integration";
+import { domainToName, fetchIntegrationManifests } from "../data/integration";
 import { haStyleScrollbar } from "../resources/styles";
 import type { HomeAssistant } from "../types";
 import "./ha-check-list-item";
@@ -188,7 +188,7 @@ export class HaFilterIntegrations extends LitElement {
           height: 0;
         }
         ha-expansion-panel {
-          --ha-card-border-radius: 0;
+          --ha-card-border-radius: var(--ha-border-radius-square);
           --expansion-panel-content-padding: 0;
         }
         .header {
@@ -206,7 +206,7 @@ export class HaFilterIntegrations extends LitElement {
           margin-inline-end: 0;
           min-width: 16px;
           box-sizing: border-box;
-          border-radius: 50%;
+          border-radius: var(--ha-border-radius-circle);
           font-size: var(--ha-font-size-xs);
           font-weight: var(--ha-font-weight-normal);
           background-color: var(--primary-color);

src/components/ha-filter-labels.ts

@@ -214,7 +214,7 @@ export class HaFilterLabels extends SubscribeMixin(LitElement) {
           height: 0;
         }
         ha-expansion-panel {
-          --ha-card-border-radius: 0;
+          --ha-card-border-radius: var(--ha-border-radius-square);
           --expansion-panel-content-padding: 0;
         }
         .header {
@@ -232,7 +232,7 @@ export class HaFilterLabels extends SubscribeMixin(LitElement) {
           margin-inline-end: 0;
           min-width: 16px;
           box-sizing: border-box;
-          border-radius: 50%;
+          border-radius: var(--ha-border-radius-circle);
           font-size: var(--ha-font-size-xs);
           font-weight: var(--ha-font-weight-normal);
           background-color: var(--primary-color);

src/components/ha-filter-states.ts

@@ -158,7 +158,7 @@ export class HaFilterStates extends LitElement {
           height: 0;
         }
         ha-expansion-panel {
-          --ha-card-border-radius: 0;
+          --ha-card-border-radius: var(--ha-border-radius-square);
           --expansion-panel-content-padding: 0;
         }
         .header {
@@ -176,7 +176,7 @@ export class HaFilterStates extends LitElement {
           margin-inline-end: 0;
           min-width: 16px;
           box-sizing: border-box;
-          border-radius: 50%;
+          border-radius: var(--ha-border-radius-circle);
           font-size: var(--ha-font-size-xs);
           font-weight: var(--ha-font-weight-normal);
           background-color: var(--primary-color);

src/components/ha-form/ha-form-expandable.ts

@@ -120,8 +120,8 @@ export class HaFormExpandable extends LitElement implements HaFormElement {
     ha-expansion-panel {
       display: block;
       --expansion-panel-content-padding: 0;
-      border-radius: 6px;
-      --ha-card-border-radius: 6px;
+      border-radius: var(--ha-border-radius-md);
+      --ha-card-border-radius: var(--ha-border-radius-md);
     }
     ha-svg-icon,
     ha-icon {

src/components/ha-grid-size-picker.ts

@@ -264,7 +264,7 @@ export class HaGridSizeEditor extends LitElement {
         left: 0;
         background-color: var(--primary-color);
         opacity: 0.3;
-        border-radius: 8px;
+        border-radius: var(--ha-border-radius-md);
         height: calc(var(--rows, 1) * 30px);
         width: calc(var(--columns, 1) * 100% / var(--total-columns, 12));
         pointer-events: none;

src/components/ha-hs-color-picker.ts

@@ -394,7 +394,7 @@ class HaHsColorPicker extends LitElement {
       width: 100%;
       height: 100%;
       object-fit: contain;
-      border-radius: 50%;
+      border-radius: var(--ha-border-radius-circle);
       cursor: pointer;
     }
     svg {

src/components/ha-icon-button-group.ts

@@ -15,7 +15,7 @@ export class HaIconButtonGroup extends LitElement {
       flex-direction: row;
       align-items: center;
       height: 48px;
-      border-radius: 28px;
+      border-radius: var(--ha-border-radius-4xl);
       background-color: rgba(139, 145, 151, 0.1);
       box-sizing: border-box;
       width: auto;

src/components/ha-icon-button-toggle.ts

@@ -18,7 +18,7 @@ export class HaIconButtonToggle extends HaIconButton {
       opacity: 0;
       transition: opacity 180ms ease-in-out;
       background-color: var(--primary-text-color);
-      border-radius: 20px;
+      border-radius: var(--ha-border-radius-2xl);
       height: 40px;
       width: 40px;
       content: "";

src/components/ha-items-display-editor.ts

@@ -394,7 +394,7 @@ export class HaItemDisplayEditor extends LitElement {
     }
     ha-md-list-item.drag-selected {
       --md-focus-ring-color: rgba(var(--rgb-accent-color), 0.6);
-      border-radius: 8px;
+      border-radius: var(--ha-border-radius-md);
       outline: solid;
       outline-color: rgba(var(--rgb-accent-color), 0.6);
       outline-offset: -2px;

src/components/ha-label-badge.ts

@@ -89,7 +89,7 @@ class HaLabelBadge extends LitElement {
           display: inline-block;
           background-color: var(--ha-label-badge-color, var(--primary-color));
           color: var(--ha-label-badge-label-color, white);
-          border-radius: 1em;
+          border-radius: var(--ha-border-radius-lg);
           padding: 9% 16% 8% 16%; /* mostly apitalized text, not much descenders => bit more top margin */
           font-weight: var(--ha-font-weight-medium);
           overflow: hidden;

src/components/ha-label.ts

@@ -39,7 +39,7 @@ class HaLabel extends LitElement {
           vertical-align: middle;
           height: 32px;
           padding: 0 16px;
-          border-radius: 18px;
+          border-radius: var(--ha-border-radius-xl);
           color: var(--ha-label-text-color);
           --mdc-icon-size: 12px;
           text-wrap: nowrap;
@@ -73,7 +73,7 @@ class HaLabel extends LitElement {
         :host([dense]) {
           height: 20px;
           padding: 0 12px;
-          border-radius: 10px;
+          border-radius: var(--ha-border-radius-md);
         }
         :host([dense]) ::slotted([slot="icon"]) {
           margin-right: 4px;

src/components/ha-labeled-slider.ts

@@ -91,7 +91,7 @@ class HaLabeledSlider extends LitElement {
       flex-grow: 1;
       align-items: center;
       background-image: var(--ha-slider-background);
-      border-radius: 4px;
+      border-radius: var(--ha-border-radius-sm);
       height: 32px;
     }
 

src/components/ha-markdown.ts

@@ -61,7 +61,7 @@ export class HaMarkdown extends LitElement {
     code,
     pre {
       background-color: var(--markdown-code-background-color, none);
-      border-radius: 3px;
+      border-radius: var(--ha-border-radius-sm);
     }
     svg {
       background-color: var(--markdown-svg-background-color, none);

src/components/ha-menu-button.ts

@@ -137,7 +137,7 @@ class HaMenuButton extends LitElement {
       right: 7px;
       inset-inline-end: 7px;
       inset-inline-start: initial;
-      border-radius: 50%;
+      border-radius: var(--ha-border-radius-circle);
       border: 2px solid var(--app-header-background-color);
     }
   `;

src/components/ha-navigation-list.ts

@@ -5,9 +5,9 @@ import { ifDefined } from "lit/directives/if-defined";
 import type { PageNavigation } from "../layouts/hass-tabs-subpage";
 import type { HomeAssistant } from "../types";
 import "./ha-icon-next";
-import "./ha-svg-icon";
 import "./ha-md-list";
 import "./ha-md-list-item";
+import "./ha-svg-icon";
 
 @customElement("ha-navigation-list")
 class HaNavigationList extends LitElement {
@@ -74,7 +74,7 @@ class HaNavigationList extends LitElement {
       padding: 8px;
     }
     .icon-background {
-      border-radius: 50%;
+      border-radius: var(--ha-border-radius-circle);
     }
     .icon-background ha-svg-icon {
       color: #fff;

src/components/ha-picker-field.ts

@@ -96,7 +96,7 @@ export class HaPickerField extends LitElement {
         }
         ha-combo-box-item {
           background-color: var(--mdc-text-field-fill-color, whitesmoke);
-          border-radius: 4px;
+          border-radius: var(--ha-border-radius-sm);
           border-end-end-radius: 0;
           border-end-start-radius: 0;
           --md-list-item-one-line-container-height: 56px;

src/components/ha-qr-scanner.ts

@@ -354,7 +354,7 @@ class HaQrScanner extends LitElement {
     }
     canvas {
       width: 100%;
-      border-radius: 16px;
+      border-radius: var(--ha-border-radius-xl);
     }
     #canvas-container {
       position: relative;
@@ -367,7 +367,7 @@ class HaQrScanner extends LitElement {
       inset-inline-start: initial;
       background: #727272b2;
       color: white;
-      border-radius: 50%;
+      border-radius: var(--ha-border-radius-circle);
     }
     .row {
       display: flex;

src/components/ha-resizable-bottom-sheet.ts

@@ -204,7 +204,7 @@ export class HaResizableBottomSheet extends LitElement {
     }
     .handle-wrapper .handle::after {
       content: "";
-      border-radius: 8px;
+      border-radius: var(--ha-border-radius-md);
       height: 4px;
       background: var(--divider-color, #e0e0e0);
       width: 80px;

src/components/ha-segmented-bar.ts

@@ -39,24 +39,22 @@ class HaSegmentedBar extends LitElement {
           <slot name="extra"></slot>
         </div>
         <div class="bar">
-          ${this.segments.map(
-            (segment, index) => html`
-              ${this.hideTooltip || !segment.label
-                ? nothing
-                : html`
-                    <ha-tooltip for="segment-${index}" placement="top">
-                      ${segment.label}
-                    </ha-tooltip>
-                  `}
-              <div
-                id="segment-${index}"
-                style=${styleMap({
-                  width: `${(segment.value / totalValue) * 100}%`,
-                  backgroundColor: segment.color,
-                })}
-              ></div>
-            `
-          )}
+          ${this.segments.map((segment) => {
+            const bar = html`<div
+              style=${styleMap({
+                width: `${(segment.value / totalValue) * 100}%`,
+                backgroundColor: segment.color,
+              })}
+            ></div>`;
+            return this.hideTooltip && !segment.label
+              ? bar
+              : html`
+                  <ha-tooltip>
+                    <span slot="content">${segment.label}</span>
+                    ${bar}
+                  </ha-tooltip>
+                `;
+          })}
         </div>
         ${this.hideLegend
           ? nothing
@@ -106,7 +104,7 @@ class HaSegmentedBar extends LitElement {
     .bar {
       display: flex;
       overflow: hidden;
-      border-radius: var(--ha-bar-border-radius, 4px);
+      border-radius: var(--ha-bar-border-radius, var(--ha-border-radius-sm));
       width: 100%;
       height: 12px;
       margin: 2px 0;
@@ -139,7 +137,7 @@ class HaSegmentedBar extends LitElement {
     .legend li .bullet {
       width: 12px;
       height: 12px;
-      border-radius: 50%;
+      border-radius: var(--ha-border-radius-circle);
     }
     .spacer {
       flex: 1;

src/components/ha-select-box.ts

@@ -1,13 +1,13 @@
-import { customElement, property } from "lit/decorators";
 import { css, html, LitElement, nothing } from "lit";
-import "./ha-radio";
+import { customElement, property } from "lit/decorators";
 import { classMap } from "lit/directives/class-map";
 import { styleMap } from "lit/directives/style-map";
-import type { HaRadio } from "./ha-radio";
 import { fireEvent } from "../common/dom/fire_event";
-import type { HomeAssistant } from "../types";
-import { computeRTL } from "../common/util/compute_rtl";
 import { stopPropagation } from "../common/dom/stop_propagation";
+import { computeRTL } from "../common/util/compute_rtl";
+import type { HomeAssistant } from "../types";
+import "./ha-radio";
+import type { HaRadio } from "./ha-radio";
 
 interface SelectBoxOptionImage {
   src: string;
@@ -122,7 +122,7 @@ export class HaSelectBox extends LitElement {
       position: relative;
       display: block;
       border: 1px solid var(--divider-color);
-      border-radius: var(--ha-card-border-radius, 12px);
+      border-radius: var(--ha-card-border-radius, var(--ha-border-radius-lg));
       display: flex;
       flex-direction: column;
       align-items: center;

src/components/ha-selector/ha-selector-media.ts

@@ -329,11 +329,11 @@ export class HaMediaSelector extends LitElement {
       flex-shrink: 0;
       position: relative;
       box-sizing: border-box;
-      border-radius: 8px;
+      border-radius: var(--ha-border-radius-md);
       overflow: hidden;
     }
     ha-card .image {
-      border-radius: 8px;
+      border-radius: var(--ha-border-radius-md);
     }
     .folder {
       --mdc-icon-size: 24px;

src/components/ha-selector/ha-selector-object.ts

@@ -301,7 +301,7 @@ export class HaObjectSelector extends LitElement {
         }
         ha-md-list-item {
           border: 1px solid var(--divider-color);
-          border-radius: 8px;
+          border-radius: var(--ha-border-radius-md);
           --ha-md-list-item-gap: 0;
           --md-list-item-top-space: 0;
           --md-list-item-bottom-space: 0;

src/components/ha-service-control.ts

@@ -13,6 +13,7 @@ import { fireEvent } from "../common/dom/fire_event";
 import { computeDomain } from "../common/entity/compute_domain";
 import { computeObjectId } from "../common/entity/compute_object_id";
 import { supportsFeature } from "../common/entity/supports-feature";
+import { hasTemplate } from "../common/string/has-template";
 import {
   fetchIntegrationManifest,
   type IntegrationManifest,
@@ -34,11 +35,10 @@ import "./ha-checkbox";
 import "./ha-icon-button";
 import "./ha-selector/ha-selector";
 import "./ha-service-picker";
+import "./ha-service-section-icon";
 import "./ha-settings-row";
 import "./ha-yaml-editor";
 import type { HaYamlEditor } from "./ha-yaml-editor";
-import "./ha-service-section-icon";
-import { hasTemplate } from "../common/string/has-template";
 
 const attributeFilter = (values: any[], attribute: any) => {
   if (typeof attribute === "object") {
@@ -999,7 +999,7 @@ export class HaServiceControl extends LitElement {
       direction: ltr;
     }
     ha-expansion-panel {
-      --ha-card-border-radius: 0;
+      --ha-card-border-radius: var(--ha-border-radius-square);
       --expansion-panel-summary-padding: 0 16px;
       --expansion-panel-content-padding: 0;
     }

src/components/ha-sidebar.ts

@@ -784,7 +784,7 @@ class HaSidebar extends SubscribeMixin(LitElement) {
           flex-shrink: 0;
           box-sizing: border-box;
           margin: 4px;
-          border-radius: 4px;
+          border-radius: var(--ha-border-radius-sm);
           --md-list-item-one-line-container-height: 40px;
           --md-list-item-top-space: 0;
           --md-list-item-bottom-space: 0;
@@ -807,7 +807,7 @@ class HaSidebar extends SubscribeMixin(LitElement) {
           --md-ripple-hover-color: var(--sidebar-selected-icon-color);
         }
         ha-md-list-item.selected::before {
-          border-radius: 4px;
+          border-radius: var(--ha-border-radius-sm);
           position: absolute;
           top: 0;
           right: 0;
@@ -857,7 +857,7 @@ class HaSidebar extends SubscribeMixin(LitElement) {
           justify-content: center;
           align-items: center;
           min-width: 8px;
-          border-radius: 10px;
+          border-radius: var(--ha-border-radius-md);
           font-weight: var(--ha-font-weight-normal);
           line-height: normal;
           background-color: var(--accent-color);
@@ -869,7 +869,7 @@ class HaSidebar extends SubscribeMixin(LitElement) {
           position: absolute;
           top: 4px;
           left: 26px;
-          border-radius: 10px;
+          border-radius: var(--ha-border-radius-md);
           font-size: 0.65em;
           line-height: var(--ha-line-height-expanded);
           padding: 0 4px;
@@ -902,7 +902,7 @@ class HaSidebar extends SubscribeMixin(LitElement) {
           display: none;
           position: absolute;
           opacity: 0.9;
-          border-radius: 2px;
+          border-radius: var(--ha-border-radius-sm);
           white-space: nowrap;
           color: var(--sidebar-background-color);
           background-color: var(--sidebar-text-color);

src/components/ha-slider.ts

@@ -44,7 +44,10 @@ export class HaSlider extends Slider {
             var(--ha-line-height-condensed)
           );
           --wa-tooltip-padding: 8px;
-          --wa-tooltip-border-radius: var(--ha-tooltip-border-radius, 4px);
+          --wa-tooltip-border-radius: var(
+            --ha-tooltip-border-radius,
+            var(--ha-border-radius-sm)
+          );
           --wa-tooltip-arrow-size: var(--ha-tooltip-arrow-size, 8px);
           --wa-z-index-tooltip: var(--ha-tooltip-z-index, 1000);
           min-width: 100px;

src/components/ha-sortable.ts

@@ -112,12 +112,12 @@ export class HaSortable extends LitElement {
         .sortable-ghost {
           box-shadow: 0 0 0 2px var(--primary-color);
           background: rgba(var(--rgb-primary-color), 0.25);
-          border-radius: 4px;
+          border-radius: var(--ha-border-radius-sm);
           opacity: 0.4;
         }
 
         .sortable-drag {
-          border-radius: 4px;
+          border-radius: var(--ha-border-radius-sm);
           opacity: 1;
           background: var(--card-background-color);
           box-shadow: 0px 4px 8px 3px #00000026;

src/components/ha-tab-group-tab.ts

@@ -18,8 +18,6 @@ export class HaTabGroupTab extends Tab {
           opacity: 0.8;
 
           color: inherit;
-
-          --wa-space-l: 16px;
         }
 
         :host([active]:not([disabled])) {

src/components/ha-target-picker.ts

@@ -783,7 +783,7 @@ export class HaTargetPicker extends SubscribeMixin(LitElement) {
         outline: none;
       }
       .mdc-chip ha-icon-button ha-svg-icon {
-        border-radius: 50%;
+        border-radius: var(--ha-border-radius-circle);
         background: var(--secondary-text-color);
       }
       .mdc-chip__icon.mdc-chip__icon--trailing {
@@ -800,7 +800,7 @@ export class HaTargetPicker extends SubscribeMixin(LitElement) {
         align-items: center;
         justify-content: center;
         --mdc-icon-size: 20px;
-        border-radius: 50%;
+        border-radius: var(--ha-border-radius-circle);
         padding: 6px;
         margin-left: -13px !important;
         margin-inline-start: -13px !important;

src/components/ha-tooltip.ts

@@ -35,7 +35,10 @@ export class HaTooltip extends Tooltip {
             var(--ha-line-height-condensed)
           );
           --wa-tooltip-padding: 8px;
-          --wa-tooltip-border-radius: var(--ha-tooltip-border-radius, 4px);
+          --wa-tooltip-border-radius: var(
+            --ha-tooltip-border-radius,
+            var(--ha-border-radius-sm)
+          );
           --wa-tooltip-arrow-size: var(--ha-tooltip-arrow-size, 8px);
           --wa-z-index-tooltip: var(--ha-tooltip-z-index, 1000);
         }

src/components/ha-yaml-editor.ts

@@ -4,14 +4,14 @@ import type { CSSResultGroup, PropertyValues } from "lit";
 import { css, html, LitElement, nothing } from "lit";
 import { customElement, property, query, state } from "lit/decorators";
 import { fireEvent } from "../common/dom/fire_event";
-import type { HomeAssistant } from "../types";
-import { haStyle } from "../resources/styles";
-import "./ha-code-editor";
-import { showToast } from "../util/toast";
 import { copyToClipboard } from "../common/util/copy-clipboard";
-import type { HaCodeEditor } from "./ha-code-editor";
-import "./ha-button";
+import { haStyle } from "../resources/styles";
+import type { HomeAssistant } from "../types";
+import { showToast } from "../util/toast";
 import "./ha-alert";
+import "./ha-button";
+import "./ha-code-editor";
+import type { HaCodeEditor } from "./ha-code-editor";
 
 const isEmpty = (obj: Record<string, unknown>): boolean => {
   if (typeof obj !== "object" || obj === null) {
@@ -203,8 +203,9 @@ export class HaYamlEditor extends LitElement {
         .card-actions {
           border-radius: var(
             --actions-border-radius,
-            0px 0px var(--ha-card-border-radius, 12px)
-              var(--ha-card-border-radius, 12px)
+            var(--ha-border-radius-square) var(--ha-border-radius-square)
+              var(--ha-card-border-radius, var(--ha-border-radius-lg))
+              var(--ha-card-border-radius, var(--ha-border-radius-lg))
           );
           border: 1px solid var(--divider-color);
           padding: 5px 16px;

src/components/map/ha-map.ts

@@ -7,27 +7,27 @@ import type {
   Layer,
   Map,
   Marker,
-  Polyline,
   MarkerClusterGroup,
+  Polyline,
 } from "leaflet";
 import type { PropertyValues } from "lit";
 import { css, ReactiveElement } from "lit";
 import { customElement, property, state } from "lit/decorators";
-import { fireEvent } from "../../common/dom/fire_event";
 import { formatDateTime } from "../../common/datetime/format_date_time";
 import {
   formatTimeWeekday,
   formatTimeWithSeconds,
 } from "../../common/datetime/format_time";
+import { fireEvent } from "../../common/dom/fire_event";
 import type { LeafletModuleType } from "../../common/dom/setup-leaflet-map";
 import { setupLeafletMap } from "../../common/dom/setup-leaflet-map";
 import { computeStateDomain } from "../../common/entity/compute_state_domain";
 import { computeStateName } from "../../common/entity/compute_state_name";
+import { DecoratedMarker } from "../../common/map/decorated_marker";
 import type { HomeAssistant, ThemeMode } from "../../types";
 import { isTouch } from "../../util/is_touch";
 import "../ha-icon-button";
 import "./ha-entity-marker";
-import { DecoratedMarker } from "../../common/map/decorated_marker";
 
 declare global {
   // for fire event
@@ -710,7 +710,7 @@ export class HaMap extends ReactiveElement {
       cursor: move !important;
     }
     .leaflet-edit-resize {
-      border-radius: 50%;
+      border-radius: var(--ha-border-radius-circle);
       cursor: nesw-resize !important;
     }
     .named-icon {
@@ -734,7 +734,7 @@ export class HaMap extends ReactiveElement {
       font-size: var(--ha-font-size-s);
       background: rgba(80, 80, 80, 0.9) !important;
       color: white !important;
-      border-radius: 4px;
+      border-radius: var(--ha-border-radius-sm);
       box-shadow: none !important;
       text-align: center;
     }
@@ -745,7 +745,7 @@ export class HaMap extends ReactiveElement {
       border: 3px solid rgba(var(--rgb-primary-color), 0.2);
       width: 32px;
       height: 32px;
-      border-radius: 20px;
+      border-radius: var(--ha-border-radius-2xl);
       text-align: center;
       color: var(--text-primary-color);
       font-size: var(--ha-font-size-m);

src/components/media-player/ha-media-player-browse.ts

@@ -1,7 +1,7 @@
 import type { LitVirtualizer } from "@lit-labs/virtualizer";
 import { grid } from "@lit-labs/virtualizer/layouts/grid";
 
-import { mdiArrowUpRight, mdiPlay, mdiPlus, mdiKeyboard } from "@mdi/js";
+import { mdiArrowUpRight, mdiKeyboard, mdiPlay, mdiPlus } from "@mdi/js";
 import type { CSSResultGroup, PropertyValues, TemplateResult } from "lit";
 import { css, html, LitElement, nothing } from "lit";
 import {
@@ -56,10 +56,10 @@ import "../ha-list-item";
 import "../ha-spinner";
 import "../ha-svg-icon";
 import "../ha-tooltip";
-import "./ha-browse-media-tts";
 import "./ha-browse-media-manual";
-import type { TtsMediaPickedEvent } from "./ha-browse-media-tts";
 import type { ManualMediaPickedEvent } from "./ha-browse-media-manual";
+import "./ha-browse-media-tts";
+import type { TtsMediaPickedEvent } from "./ha-browse-media-tts";
 
 declare global {
   interface HASSDomEvents {
@@ -1174,7 +1174,8 @@ export class HaMediaPlayerBrowse extends LitElement {
         }
 
         ha-card .image {
-          border-radius: 3px 3px 0 0;
+          border-radius: var(--ha-border-radius-sm) var(--ha-border-radius-sm)
+            var(--ha-border-radius-square) var(--ha-border-radius-square);
         }
 
         .image {
@@ -1216,7 +1217,7 @@ export class HaMediaPlayerBrowse extends LitElement {
         .child .play {
           position: absolute;
           transition: color 0.5s;
-          border-radius: 50%;
+          border-radius: var(--ha-border-radius-circle);
           top: calc(50% - 40px);
           right: calc(50% - 35px);
           opacity: 0;
@@ -1273,7 +1274,7 @@ export class HaMediaPlayerBrowse extends LitElement {
           background-size: contain;
           background-repeat: no-repeat;
           background-position: center;
-          border-radius: 2px;
+          border-radius: var(--ha-border-radius-sm);
           display: flex;
           align-content: center;
           align-items: center;
@@ -1284,7 +1285,7 @@ export class HaMediaPlayerBrowse extends LitElement {
           opacity: 0;
           transition: all 0.5s;
           background-color: rgba(var(--rgb-card-background-color), 0.5);
-          border-radius: 50%;
+          border-radius: var(--ha-border-radius-circle);
           --mdc-icon-button-size: 40px;
         }
 
@@ -1344,7 +1345,7 @@ export class HaMediaPlayerBrowse extends LitElement {
           margin-bottom: 8px;
           position: relative;
           background-position: center;
-          border-radius: 0;
+          border-radius: var(--ha-border-radius-square);
           transition:
             width 0.4s,
             height 0.4s,

src/components/tile/ha-tile-badge.ts

@@ -26,7 +26,7 @@ export class HaTileBadge extends LitElement {
       line-height: 0;
       width: 16px;
       height: 16px;
-      border-radius: 8px;
+      border-radius: var(--ha-border-radius-md);
       background-color: var(--tile-badge-background-color);
       transition: background-color 280ms ease-in-out;
     }

src/components/trace/ha-timeline.ts

@@ -90,7 +90,7 @@ export class HaTimeline extends LitElement {
             --timeline-ball-color,
             var(--timeline-color, var(--secondary-text-color))
           );
-          border-radius: 50%;
+          border-radius: var(--ha-border-radius-circle);
         }
         :host([raised]) ha-svg-icon {
           transform: scale(1.3);

src/components/user/ha-person-badge.ts

@@ -45,7 +45,7 @@ class PersonBadge extends LitElement {
       width: 100%;
       height: 100%;
       background-size: cover;
-      border-radius: 50%;
+      border-radius: var(--ha-border-radius-circle);
     }
     .initials {
       display: inline-flex;
@@ -54,7 +54,7 @@ class PersonBadge extends LitElement {
       box-sizing: border-box;
       width: 100%;
       height: 100%;
-      border-radius: 50%;
+      border-radius: var(--ha-border-radius-circle);
       background-color: var(--light-primary-color);
       text-decoration: none;
       color: var(--text-light-primary-color, var(--primary-text-color));

src/components/user/ha-user-badge.ts

@@ -92,7 +92,7 @@ class UserBadge extends LitElement {
       width: 100%;
       height: 100%;
       background-size: cover;
-      border-radius: 50%;
+      border-radius: var(--ha-border-radius-circle);
     }
     .initials {
       display: inline-flex;
@@ -101,7 +101,7 @@ class UserBadge extends LitElement {
       box-sizing: border-box;
       width: 100%;
       height: 100%;
-      border-radius: 50%;
+      border-radius: var(--ha-border-radius-circle);
       background-color: var(--light-primary-color);
       text-decoration: none;
       color: var(--text-light-primary-color, var(--primary-text-color));

src/data/lovelace/config/badge.ts

@@ -4,7 +4,6 @@ export interface LovelaceBadgeConfig {
   type: string;
   [key: string]: any;
   visibility?: Condition[];
-  disabled?: boolean;
 }
 
 export const ensureBadgeConfig = (

src/dialogs/config-flow/step-flow-create-entry.ts

@@ -318,7 +318,7 @@ class StepFlowCreateEntry extends LitElement {
         .device {
           border: 1px solid var(--divider-color);
           padding: 6px;
-          border-radius: 4px;
+          border-radius: var(--ha-border-radius-sm);
           margin: 4px;
           display: inline-block;
         }

src/dialogs/enter-code/dialog-enter-code.ts

@@ -229,7 +229,7 @@ export class DialogEnterCode
     ha-control-button {
       width: 56px;
       height: 56px;
-      --control-button-border-radius: 28px;
+      --control-button-border-radius: var(--ha-border-radius-4xl);
       --mdc-icon-size: 24px;
       font-size: var(--ha-font-size-2xl);
     }

src/dialogs/image-cropper-dialog/image-cropper-dialog.ts

@@ -2,11 +2,11 @@ import Cropper from "cropperjs";
 // @ts-ignore
 import cropperCss from "cropperjs/dist/cropper.css";
 import type { CSSResultGroup, PropertyValues, TemplateResult } from "lit";
-import { css, html, nothing, LitElement, unsafeCSS } from "lit";
-import { customElement, property, state, query } from "lit/decorators";
+import { css, html, LitElement, nothing, unsafeCSS } from "lit";
+import { customElement, property, query, state } from "lit/decorators";
 import { classMap } from "lit/directives/class-map";
-import "../../components/ha-dialog";
 import "../../components/ha-button";
+import "../../components/ha-dialog";
 import { haStyleDialog } from "../../resources/styles";
 import type { HomeAssistant } from "../../types";
 import type { HaImageCropperDialogParams } from "./show-image-cropper-dialog";
@@ -150,7 +150,7 @@ export class HaImagecropperDialog extends LitElement {
         }
         .container.round .cropper-view-box,
         .container.round .cropper-face {
-          border-radius: 50%;
+          border-radius: var(--ha-border-radius-circle);
         }
         .cropper-line,
         .cropper-point,

src/dialogs/more-info/components/lights/dialog-light-color-favorite.ts

@@ -281,7 +281,7 @@ class DialogLightColorFavorite extends LitElement {
           width: 30px;
           height: 30px;
           flex: none;
-          border-radius: 15px;
+          border-radius: var(--ha-border-radius-xl);
         }
         .wheel.color {
           background-image: url("/static/images/color_wheel.png");

src/dialogs/more-info/components/lights/ha-favorite-color-button.ts

@@ -10,8 +10,8 @@ import {
   temperature2rgb,
 } from "../../../../common/color/convert-light-color";
 import { luminosity } from "../../../../common/color/rgb";
-import type { HaOutlinedIconButton } from "../../../../components/ha-outlined-icon-button";
 import "../../../../components/ha-outlined-icon-button";
+import type { HaOutlinedIconButton } from "../../../../components/ha-outlined-icon-button";
 import "../../../../components/ha-svg-icon";
 import type { LightColor, LightEntity } from "../../../../data/light";
 
@@ -106,7 +106,7 @@ class MoreInfoViewLightColorPicker extends LitElement {
           --md-ripple-focus-color: 0;
           --md-ripple-hover-opacity: 0;
           --md-ripple-pressed-opacity: 0;
-          border-radius: 9999px;
+          border-radius: var(--ha-border-radius-pill);
         }
         :host([disabled]) {
           pointer-events: none;

src/dialogs/more-info/components/lights/ha-more-info-light-favorite-colors.ts

@@ -316,7 +316,7 @@ export class HaMoreInfoLightFavoriteColors extends LitElement {
       outline: none;
       background-color: var(--secondary-background-color);
       padding: 0;
-      border-radius: 10px;
+      border-radius: var(--ha-border-radius-md);
       border: none;
       cursor: pointer;
       display: block;

src/dialogs/more-info/components/lights/light-color-temp-picker.ts

@@ -14,10 +14,10 @@ import { stateColorCss } from "../../../../common/entity/state_color";
 import { throttle } from "../../../../common/util/throttle";
 import "../../../../components/ha-control-slider";
 import { UNAVAILABLE } from "../../../../data/entity";
+import { DOMAIN_ATTRIBUTES_UNITS } from "../../../../data/entity_attributes";
 import type { LightColor, LightEntity } from "../../../../data/light";
 import { LightColorMode } from "../../../../data/light";
 import type { HomeAssistant } from "../../../../types";
-import { DOMAIN_ATTRIBUTES_UNITS } from "../../../../data/entity_attributes";
 
 declare global {
   interface HASSDomEvents {
@@ -179,7 +179,7 @@ class LightColorTempPicker extends LitElement {
           max-height: 320px;
           min-height: 200px;
           --control-slider-thickness: 130px;
-          --control-slider-border-radius: 36px;
+          --control-slider-border-radius: var(--ha-border-radius-6xl);
           --control-slider-color: var(--primary-color);
           --control-slider-background: -webkit-linear-gradient(
             top,

src/dialogs/more-info/components/siren/ha-more-info-siren-advanced-controls.ts

@@ -1,26 +1,26 @@
+import { mdiClose, mdiPlay, mdiStop } from "@mdi/js";
+import type { HassEntity } from "home-assistant-js-websocket";
 import type { CSSResultGroup } from "lit";
 import { css, html, LitElement, nothing } from "lit";
 import { customElement, property, query, state } from "lit/decorators";
-import type { HassEntity } from "home-assistant-js-websocket";
-import { mdiClose, mdiPlay, mdiStop } from "@mdi/js";
-import type { HomeAssistant } from "../../../../types";
+import { fireEvent } from "../../../../common/dom/fire_event";
 import { stopPropagation } from "../../../../common/dom/stop_propagation";
+import { supportsFeature } from "../../../../common/entity/supports-feature";
+import "../../../../components/ha-button";
+import "../../../../components/ha-control-button";
+import "../../../../components/ha-dialog-header";
+import "../../../../components/ha-icon-button";
+import "../../../../components/ha-list-item";
+import type { HaMdDialog } from "../../../../components/ha-md-dialog";
 import {
   getMobileCloseToBottomAnimation,
   getMobileOpenFromBottomAnimation,
 } from "../../../../components/ha-md-dialog";
-import "../../../../components/ha-dialog-header";
-import "../../../../components/ha-icon-button";
-import "../../../../components/ha-button";
-import "../../../../components/ha-textfield";
-import "../../../../components/ha-control-button";
 import "../../../../components/ha-select";
-import "../../../../components/ha-list-item";
-import type { HaMdDialog } from "../../../../components/ha-md-dialog";
-import { fireEvent } from "../../../../common/dom/fire_event";
-import { supportsFeature } from "../../../../common/entity/supports-feature";
+import "../../../../components/ha-textfield";
 import { SirenEntityFeature } from "../../../../data/siren";
 import { haStyle } from "../../../../resources/styles";
+import type { HomeAssistant } from "../../../../types";
 
 @customElement("ha-more-info-siren-advanced-controls")
 class MoreInfoSirenAdvancedControls extends LitElement {
@@ -212,7 +212,7 @@ class MoreInfoSirenAdvancedControls extends LitElement {
           margin-top: 16px;
         }
         ha-control-button {
-          --control-button-border-radius: 16px;
+          --control-button-border-radius: var(--ha-border-radius-xl);
           --mdc-icon-size: 24px;
           width: 64px;
           height: 64px;

src/dialogs/more-info/controls/more-info-alarm_control_panel.ts

@@ -99,7 +99,7 @@ class MoreInfoAlarmControlPanel extends LitElement {
           --mdc-icon-size: 80px;
           animation: pulse 1s infinite;
           color: var(--icon-color);
-          border-radius: 50%;
+          border-radius: var(--ha-border-radius-circle);
           width: 144px;
           height: 144px;
           display: flex;
@@ -113,7 +113,7 @@ class MoreInfoAlarmControlPanel extends LitElement {
           left: 0;
           height: 100%;
           width: 100%;
-          border-radius: 50%;
+          border-radius: var(--ha-border-radius-circle);
           background-color: var(--icon-color);
           transition: background-color 180ms ease-in-out;
           opacity: 0.2;
@@ -123,7 +123,7 @@ class MoreInfoAlarmControlPanel extends LitElement {
           min-width: 130px;
           max-width: 200px;
           margin: 0 auto;
-          --control-button-border-radius: 24px;
+          --control-button-border-radius: var(--ha-border-radius-3xl);
         }
       `,
     ];

src/dialogs/more-info/controls/more-info-light.ts

@@ -344,7 +344,7 @@ class MoreInfoLight extends LitElement {
           flex-direction: row;
           align-items: center;
           height: 48px;
-          border-radius: 24px;
+          border-radius: var(--ha-border-radius-3xl);
           background-color: rgba(139, 145, 151, 0.1);
           box-sizing: border-box;
           width: auto;
@@ -353,7 +353,7 @@ class MoreInfoLight extends LitElement {
           width: 30px;
           height: 30px;
           flex: none;
-          border-radius: 15px;
+          border-radius: var(--ha-border-radius-xl);
         }
         .wheel.color {
           background-image: url("/static/images/color_wheel.png");