diff --git a/setup.py b/setup.py
index 834ffe3aab..289a8db76f 100644
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="home-assistant-frontend",
-    version="20200807.1",
+    version="20200811.0",
     description="The Home Assistant frontend",
     url="https://github.com/home-assistant/home-assistant-polymer",
     author="The Home Assistant Authors",
diff --git a/src/html/index.html.template b/src/html/index.html.template
index fe4271c0fb..5ec5dd1dc1 100644
--- a/src/html/index.html.template
+++ b/src/html/index.html.template
@@ -48,7 +48,7 @@
       }
       @media (prefers-color-scheme: dark) {
         html {
-          background-color: #111111;
+          background-color: var(--primary-background-color, #111111);
         }
         #ha-init-skeleton::before {
           background-color: #1c1c1c;
diff --git a/src/panels/lovelace/editor/view-editor/hui-dialog-edit-view.ts b/src/panels/lovelace/editor/view-editor/hui-dialog-edit-view.ts
index a03c42f826..99a4022efc 100644
--- a/src/panels/lovelace/editor/view-editor/hui-dialog-edit-view.ts
+++ b/src/panels/lovelace/editor/view-editor/hui-dialog-edit-view.ts
@@ -342,6 +342,7 @@ export class HuiDialogEditView extends LitElement {
       css`
         h2 {
           display: block;
+          color: var(--primary-text-color);
           line-height: normal;
           -moz-osx-font-smoothing: grayscale;
           -webkit-font-smoothing: antialiased;
@@ -380,6 +381,7 @@ export class HuiDialogEditView extends LitElement {
         }
         paper-tabs {
           --paper-tabs-selection-bar-color: var(--primary-color);
+          color: var(--primary-text-color);
           text-transform: uppercase;
           border-bottom: 1px solid rgba(0, 0, 0, 0.1);
           padding: 0 20px;
@@ -411,6 +413,12 @@ export class HuiDialogEditView extends LitElement {
           margin: 12px 16px;
           flex-wrap: wrap;
         }
+
+        @media all and (min-width: 600px) {
+          ha-dialog {
+            --mdc-dialog-min-width: 600px;
+          }
+        }
       `,
     ];
   }