diff --git a/setup.py b/setup.py
index cfcbecfedd..21c1ec8bc5 100644
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="home-assistant-frontend",
-    version="20200715.0",
+    version="20200715.1",
     description="The Home Assistant frontend",
     url="https://github.com/home-assistant/home-assistant-polymer",
     author="The Home Assistant Authors",
diff --git a/src/common/style/icon_color_css.ts b/src/common/style/icon_color_css.ts
index b2bb4e5d95..8f55eba461 100644
--- a/src/common/style/icon_color_css.ts
+++ b/src/common/style/icon_color_css.ts
@@ -19,7 +19,13 @@ export const iconColorCSS = css`
   ha-icon[data-domain="sun"][data-state="above_horizon"],
   ha-icon[data-domain="switch"][data-state="on"],
   ha-icon[data-domain="timer"][data-state="active"],
-  ha-icon[data-domain="vacuum"][data-state="cleaning"] {
+  ha-icon[data-domain="vacuum"][data-state="cleaning"],
+  ha-icon[data-domain="group"][data-state="on"],
+  ha-icon[data-domain="group"][data-state="home"],
+  ha-icon[data-domain="group"][data-state="open"],
+  ha-icon[data-domain="group"][data-state="locked"],
+  ha-icon[data-domain="group"][data-state="problem"]   
+  {
     color: var(--paper-item-icon-active-color, #fdd835);
   }
 
diff --git a/src/panels/config/automation/ha-automation-editor.ts b/src/panels/config/automation/ha-automation-editor.ts
index 5c93e80db0..3321a4956d 100644
--- a/src/panels/config/automation/ha-automation-editor.ts
+++ b/src/panels/config/automation/ha-automation-editor.ts
@@ -47,7 +47,7 @@ import { HaDeviceTrigger } from "./trigger/types/ha-automation-trigger-device";
 import { mdiContentSave } from "@mdi/js";
 import { PaperListboxElement } from "@polymer/paper-listbox";
 
-const MODES = ["parallel", "single", "restart", "queued"];
+const MODES = ["single", "restart", "queued", "parallel"];
 const MODES_MAX = ["queued", "parallel"];
 
 export class HaAutomationEditor extends LitElement {
diff --git a/src/panels/config/cloud/forgot-password/cloud-forgot-password.js b/src/panels/config/cloud/forgot-password/cloud-forgot-password.js
index 35d3c7969e..68acfeec7e 100644
--- a/src/panels/config/cloud/forgot-password/cloud-forgot-password.js
+++ b/src/panels/config/cloud/forgot-password/cloud-forgot-password.js
@@ -45,9 +45,13 @@ class CloudForgotPassword extends LocalizeMixin(EventsMixin(PolymerElement)) {
           display: none;
         }
       </style>
-      <hass-subpage header=[[localize('ui.panel.config.cloud.forgot_password.title')]]>
+      <hass-subpage
+        header="[[localize('ui.panel.config.cloud.forgot_password.title')]]"
+      >
         <div class="content">
-          <ha-card header=[[localize('ui.panel.config.cloud.forgot_password.subtitle')]]>
+          <ha-card
+            header="[[localize('ui.panel.config.cloud.forgot_password.subtitle')]]"
+          >
             <div class="card-content">
               <p>
                 [[localize('ui.panel.config.cloud.forgot_password.instructions')]]
diff --git a/src/panels/lovelace/cards/hui-alarm-panel-card.ts b/src/panels/lovelace/cards/hui-alarm-panel-card.ts
index 2137bca09c..72f120415e 100644
--- a/src/panels/lovelace/cards/hui-alarm-panel-card.ts
+++ b/src/panels/lovelace/cards/hui-alarm-panel-card.ts
@@ -191,7 +191,7 @@ class HuiAlarmPanelCard extends LitElement implements LovelaceCard {
           : html`
               <paper-input
                 id="alarmCode"
-                label="Alarm Code"
+                .label=${this.hass.localize('ui.card.alarm_control_panel.code')}
                 type="password"
               ></paper-input>
             `}
diff --git a/src/translations/en.json b/src/translations/en.json
index cd2f1eb8a9..9dcdeb92e0 100755
--- a/src/translations/en.json
+++ b/src/translations/en.json
@@ -847,10 +847,10 @@
               "label": "Mode",
               "description": "The mode controls what happens when the automation is triggered while the actions are still running from a previous trigger. Check the {documentation_link} for more info.",
               "documentation": "automation documentation",
-              "single": "Single",
+              "single": "Single (default)",
               "restart": "Restart",
               "queued": "Queued",
-              "parallel": "Parallel (default)"
+              "parallel": "Parallel"
             },
             "max": {
               "queued": "Queue length",