diff --git a/src/components/map/ha-location-editor.ts b/src/components/map/ha-location-editor.ts
index 9bfcf5e50e..3b42fd38cc 100644
--- a/src/components/map/ha-location-editor.ts
+++ b/src/components/map/ha-location-editor.ts
@@ -279,6 +279,7 @@ class LocationEditor extends LitElement {
       }
       #map {
         height: 100%;
+        background: inherit;
       }
       .leaflet-edit-move {
         border-radius: 50%;
diff --git a/src/html/onboarding.html.template b/src/html/onboarding.html.template
index 0a605baba1..f4bc333ede 100644
--- a/src/html/onboarding.html.template
+++ b/src/html/onboarding.html.template
@@ -11,7 +11,12 @@
       @media (prefers-color-scheme: dark) {
         html {
           background-color: #111111;
-          color: var(--primary-text-color, #e1e1e1);
+          color: #e1e1e1;
+        }
+        ha-onboarding {
+          --primary-text-color: #e1e1e1;
+          --secondary-text-color: #9b9b9b;
+          --disabled-text-color: #6f6f6f;
         }
       }
       .content {
diff --git a/src/onboarding/onboarding-create-user.ts b/src/onboarding/onboarding-create-user.ts
index d12fcd97ce..bb3f27ba2e 100644
--- a/src/onboarding/onboarding-create-user.ts
+++ b/src/onboarding/onboarding-create-user.ts
@@ -6,9 +6,9 @@ import {
   CSSResult,
   customElement,
   html,
+  internalProperty,
   LitElement,
   property,
-  internalProperty,
   PropertyValues,
   TemplateResult,
 } from "lit-element";