diff --git a/homeassistant/components/abode/strings.json b/homeassistant/components/abode/strings.json
index 5c1385c6ecd..162d6400fb2 100644
--- a/homeassistant/components/abode/strings.json
+++ b/homeassistant/components/abode/strings.json
@@ -1,6 +1,6 @@
 {
+  "title": "Abode",
   "config": {
-    "title": "Abode",
     "step": {
       "user": {
         "title": "Fill in your Abode login information",
diff --git a/homeassistant/components/adguard/strings.json b/homeassistant/components/adguard/strings.json
index fb17a8ea471..c0c0c22f560 100644
--- a/homeassistant/components/adguard/strings.json
+++ b/homeassistant/components/adguard/strings.json
@@ -1,6 +1,6 @@
 {
+  "title": "AdGuard Home",
   "config": {
-    "title": "AdGuard Home",
     "step": {
       "user": {
         "title": "Link your AdGuard Home.",
diff --git a/homeassistant/components/airly/strings.json b/homeassistant/components/airly/strings.json
index d8047265415..8e35b091b33 100644
--- a/homeassistant/components/airly/strings.json
+++ b/homeassistant/components/airly/strings.json
@@ -1,6 +1,6 @@
 {
+  "title": "Airly",
   "config": {
-    "title": "Airly",
     "step": {
       "user": {
         "title": "Airly",
diff --git a/homeassistant/components/airvisual/strings.json b/homeassistant/components/airvisual/strings.json
index 8791e6d864d..86c6a2d2c6e 100644
--- a/homeassistant/components/airvisual/strings.json
+++ b/homeassistant/components/airvisual/strings.json
@@ -1,6 +1,6 @@
 {
+  "title": "AirVisual",
   "config": {
-    "title": "AirVisual",
     "step": {
       "user": {
         "title": "Configure AirVisual",
diff --git a/homeassistant/components/almond/strings.json b/homeassistant/components/almond/strings.json
index 2ae4e632d6b..dd31116212c 100644
--- a/homeassistant/components/almond/strings.json
+++ b/homeassistant/components/almond/strings.json
@@ -1,4 +1,5 @@
 {
+  "title": "Almond",
   "config": {
     "step": {
       "pick_implementation": {
@@ -13,7 +14,6 @@
       "already_setup": "You can only configure one Almond account.",
       "cannot_connect": "Unable to connect to the Almond server.",
       "missing_configuration": "Please check the documentation on how to set up Almond."
-    },
-    "title": "Almond"
+    }
   }
 }
diff --git a/homeassistant/components/ambiclimate/strings.json b/homeassistant/components/ambiclimate/strings.json
index f38836c0414..02ccf930c0c 100644
--- a/homeassistant/components/ambiclimate/strings.json
+++ b/homeassistant/components/ambiclimate/strings.json
@@ -1,6 +1,6 @@
 {
+  "title": "Ambiclimate",
   "config": {
-    "title": "Ambiclimate",
     "step": {
       "auth": {
         "title": "Authenticate Ambiclimate",
diff --git a/homeassistant/components/ambient_station/strings.json b/homeassistant/components/ambient_station/strings.json
index 3cfe36b3220..763c22499aa 100644
--- a/homeassistant/components/ambient_station/strings.json
+++ b/homeassistant/components/ambient_station/strings.json
@@ -1,6 +1,6 @@
 {
+  "title": "Ambient PWS",
   "config": {
-    "title": "Ambient PWS",
     "step": {
       "user": {
         "title": "Fill in your information",
diff --git a/homeassistant/components/arcam_fmj/strings.json b/homeassistant/components/arcam_fmj/strings.json
index 85413da8f80..57eedd7885c 100644
--- a/homeassistant/components/arcam_fmj/strings.json
+++ b/homeassistant/components/arcam_fmj/strings.json
@@ -1,5 +1,3 @@
 {
-  "config": {
-    "title": "Arcam FMJ"
-  }
+  "title": "Arcam FMJ"
 }
diff --git a/homeassistant/components/august/strings.json b/homeassistant/components/august/strings.json
index da8c4918452..07c77b806f6 100644
--- a/homeassistant/components/august/strings.json
+++ b/homeassistant/components/august/strings.json
@@ -1,4 +1,5 @@
 {
+  "title": "August",
   "config": {
     "error": {
       "unknown": "Unexpected error",
@@ -26,7 +27,6 @@
         },
         "title": "Setup an August account"
       }
-    },
-    "title": "August"
+    }
   }
 }
diff --git a/homeassistant/components/axis/strings.json b/homeassistant/components/axis/strings.json
index 04a9f9e388a..4479e269e87 100644
--- a/homeassistant/components/axis/strings.json
+++ b/homeassistant/components/axis/strings.json
@@ -1,6 +1,6 @@
 {
+  "title": "Axis device",
   "config": {
-    "title": "Axis device",
     "flow_title": "Axis device: {name} ({host})",
     "step": {
       "user": {
diff --git a/homeassistant/components/braviatv/strings.json b/homeassistant/components/braviatv/strings.json
index e98bea189d4..d20619c3df6 100644
--- a/homeassistant/components/braviatv/strings.json
+++ b/homeassistant/components/braviatv/strings.json
@@ -1,6 +1,6 @@
 {
+  "title": "Sony Bravia TV",
   "config": {
-    "title": "Sony Bravia TV",
     "step": {
       "user": {
         "title": "Sony Bravia TV",
diff --git a/homeassistant/components/brother/strings.json b/homeassistant/components/brother/strings.json
index c14903df950..22df2e88d77 100644
--- a/homeassistant/components/brother/strings.json
+++ b/homeassistant/components/brother/strings.json
@@ -1,6 +1,6 @@
 {
+  "title": "Brother Printer",
   "config": {
-    "title": "Brother Printer",
     "flow_title": "Brother Printer: {model} {serial_number}",
     "step": {
       "user": {
diff --git a/homeassistant/components/cast/strings.json b/homeassistant/components/cast/strings.json
index eecdecbfdf9..06bbf1b764c 100644
--- a/homeassistant/components/cast/strings.json
+++ b/homeassistant/components/cast/strings.json
@@ -1,6 +1,6 @@
 {
+  "title": "Google Cast",
   "config": {
-    "title": "Google Cast",
     "step": {
       "confirm": {
         "title": "Google Cast",
diff --git a/homeassistant/components/cert_expiry/strings.json b/homeassistant/components/cert_expiry/strings.json
index e47613e17ca..f456809147b 100644
--- a/homeassistant/components/cert_expiry/strings.json
+++ b/homeassistant/components/cert_expiry/strings.json
@@ -1,6 +1,6 @@
 {
+  "title": "Certificate Expiry",
   "config": {
-    "title": "Certificate Expiry",
     "step": {
       "user": {
         "title": "Define the certificate to test",
diff --git a/homeassistant/components/coolmaster/strings.json b/homeassistant/components/coolmaster/strings.json
index d309f8c9c93..c16aa9d52ad 100644
--- a/homeassistant/components/coolmaster/strings.json
+++ b/homeassistant/components/coolmaster/strings.json
@@ -1,6 +1,6 @@
 {
+  "title": "CoolMasterNet",
   "config": {
-    "title": "CoolMasterNet",
     "step": {
       "user": {
         "title": "Setup your CoolMasterNet connection details.",
diff --git a/homeassistant/components/coronavirus/strings.json b/homeassistant/components/coronavirus/strings.json
index fd4873c808c..9b21c015f58 100644
--- a/homeassistant/components/coronavirus/strings.json
+++ b/homeassistant/components/coronavirus/strings.json
@@ -1,6 +1,6 @@
 {
+  "title": "Coronavirus",
   "config": {
-    "title": "Coronavirus",
     "step": {
       "user": {
         "title": "Pick a country to monitor",
diff --git a/homeassistant/components/daikin/strings.json b/homeassistant/components/daikin/strings.json
index 6c48024efc4..e165b66f002 100644
--- a/homeassistant/components/daikin/strings.json
+++ b/homeassistant/components/daikin/strings.json
@@ -1,6 +1,6 @@
 {
+  "title": "Daikin AC",
   "config": {
-    "title": "Daikin AC",
     "step": {
       "user": {
         "title": "Configure Daikin AC",
diff --git a/homeassistant/components/deconz/strings.json b/homeassistant/components/deconz/strings.json
index 735a9bf58e5..2293be4b247 100644
--- a/homeassistant/components/deconz/strings.json
+++ b/homeassistant/components/deconz/strings.json
@@ -1,6 +1,6 @@
 {
+  "title": "deCONZ Zigbee gateway",
   "config": {
-    "title": "deCONZ Zigbee gateway",
     "flow_title": "deCONZ Zigbee gateway ({host})",
     "step": {
       "init": {
diff --git a/homeassistant/components/demo/strings.json b/homeassistant/components/demo/strings.json
index 33f3b4229dc..95497b8bf19 100644
--- a/homeassistant/components/demo/strings.json
+++ b/homeassistant/components/demo/strings.json
@@ -1,7 +1,5 @@
 {
-  "config": {
-    "title": "Demo"
-  },
+  "title": "Demo",
   "options": {
     "step": {
       "init": {
diff --git a/homeassistant/components/dialogflow/strings.json b/homeassistant/components/dialogflow/strings.json
index 4a3e91a3e50..1a477ca4d57 100644
--- a/homeassistant/components/dialogflow/strings.json
+++ b/homeassistant/components/dialogflow/strings.json
@@ -1,6 +1,6 @@
 {
+  "title": "Dialogflow",
   "config": {
-    "title": "Dialogflow",
     "step": {
       "user": {
         "title": "Set up the Dialogflow Webhook",
diff --git a/homeassistant/components/directv/strings.json b/homeassistant/components/directv/strings.json
index e0a5a477ad2..254229d091f 100644
--- a/homeassistant/components/directv/strings.json
+++ b/homeassistant/components/directv/strings.json
@@ -1,6 +1,6 @@
 {
+  "title": "DirecTV",
   "config": {
-    "title": "DirecTV",
     "flow_title": "DirecTV: {name}",
     "step": {
       "ssdp_confirm": {
diff --git a/homeassistant/components/doorbird/strings.json b/homeassistant/components/doorbird/strings.json
index 6bfda8c31dd..9b56bc9f39d 100644
--- a/homeassistant/components/doorbird/strings.json
+++ b/homeassistant/components/doorbird/strings.json
@@ -1,4 +1,5 @@
 {
+  "title": "DoorBird",
   "options": {
     "step": {
       "init": {
@@ -26,7 +27,6 @@
       "link_local_address": "Link local addresses are not supported",
       "not_doorbird_device": "This device is not a DoorBird"
     },
-    "title": "DoorBird",
     "flow_title": "DoorBird {name} ({host})",
     "error": {
       "invalid_auth": "Invalid authentication",
diff --git a/homeassistant/components/ecobee/strings.json b/homeassistant/components/ecobee/strings.json
index a6eaa488c60..535c5add3f3 100644
--- a/homeassistant/components/ecobee/strings.json
+++ b/homeassistant/components/ecobee/strings.json
@@ -1,6 +1,6 @@
 {
+  "title": "ecobee",
   "config": {
-    "title": "ecobee",
     "step": {
       "user": {
         "title": "ecobee API key",
diff --git a/homeassistant/components/elgato/strings.json b/homeassistant/components/elgato/strings.json
index 03c46f02efc..03708438540 100644
--- a/homeassistant/components/elgato/strings.json
+++ b/homeassistant/components/elgato/strings.json
@@ -1,6 +1,6 @@
 {
+  "title": "Elgato Key Light",
   "config": {
-    "title": "Elgato Key Light",
     "flow_title": "Elgato Key Light: {serial_number}",
     "step": {
       "user": {
diff --git a/homeassistant/components/elkm1/strings.json b/homeassistant/components/elkm1/strings.json
index 36272a3de88..85d12844593 100644
--- a/homeassistant/components/elkm1/strings.json
+++ b/homeassistant/components/elkm1/strings.json
@@ -1,6 +1,6 @@
 {
+  "title": "Elk-M1 Control",
   "config": {
-    "title": "Elk-M1 Control",
     "step": {
       "user": {
         "title": "Connect to Elk-M1 Control",
diff --git a/homeassistant/components/emulated_roku/strings.json b/homeassistant/components/emulated_roku/strings.json
index 987e4907911..960e2f22af3 100644
--- a/homeassistant/components/emulated_roku/strings.json
+++ b/homeassistant/components/emulated_roku/strings.json
@@ -1,4 +1,5 @@
 {
+  "title": "EmulatedRoku",
   "config": {
     "abort": {
       "name_exists": "Name already exists"
@@ -15,7 +16,6 @@
         },
         "title": "Define server configuration"
       }
-    },
-    "title": "EmulatedRoku"
+    }
   }
 }
diff --git a/homeassistant/components/esphome/strings.json b/homeassistant/components/esphome/strings.json
index 00d1ab1828e..0c1c50e493d 100644
--- a/homeassistant/components/esphome/strings.json
+++ b/homeassistant/components/esphome/strings.json
@@ -1,4 +1,5 @@
 {
+  "title": "ESPHome",
   "config": {
     "abort": {
       "already_configured": "ESP is already configured"
@@ -29,7 +30,6 @@
         "title": "Discovered ESPHome node"
       }
     },
-    "title": "ESPHome",
     "flow_title": "ESPHome: {name}"
   }
 }
diff --git a/homeassistant/components/flume/strings.json b/homeassistant/components/flume/strings.json
index ed557133a9b..65ee5b59a41 100644
--- a/homeassistant/components/flume/strings.json
+++ b/homeassistant/components/flume/strings.json
@@ -1,25 +1,25 @@
 {
-   "config" : {
-      "error" : {
-         "unknown" : "Unexpected error",
-         "invalid_auth" : "Invalid authentication",
-         "cannot_connect" : "Failed to connect, please try again"
-      },
-      "step" : {
-         "user" : {
-            "description" : "In order to access the Flume Personal API, you will need to request a 'Client ID' and 'Client Secret' at https://portal.flumetech.com/settings#token",
-            "title" : "Connect to your Flume Account",
-            "data" : {
-               "username" : "Username",
-               "client_secret" : "Client Secret",
-               "client_id" : "Client ID",
-               "password" : "Password"
-            }
-         }
-      },
-      "abort" : {
-         "already_configured" : "This account is already configured"
-      },
-      "title" : "Flume"
-   }
+  "title": "Flume",
+  "config": {
+    "error": {
+      "unknown": "Unexpected error",
+      "invalid_auth": "Invalid authentication",
+      "cannot_connect": "Failed to connect, please try again"
+    },
+    "step": {
+      "user": {
+        "description": "In order to access the Flume Personal API, you will need to request a 'Client ID' and 'Client Secret' at https://portal.flumetech.com/settings#token",
+        "title": "Connect to your Flume Account",
+        "data": {
+          "username": "Username",
+          "client_secret": "Client Secret",
+          "client_id": "Client ID",
+          "password": "Password"
+        }
+      }
+    },
+    "abort": {
+      "already_configured": "This account is already configured"
+    }
+  }
 }
diff --git a/homeassistant/components/flunearyou/strings.json b/homeassistant/components/flunearyou/strings.json
index 5539c6f82df..14ebb5ecb95 100644
--- a/homeassistant/components/flunearyou/strings.json
+++ b/homeassistant/components/flunearyou/strings.json
@@ -1,6 +1,6 @@
 {
+  "title": "Flu Near You",
   "config": {
-    "title": "Flu Near You",
     "step": {
       "user": {
         "title": "Configure Flu Near You",
diff --git a/homeassistant/components/freebox/strings.json b/homeassistant/components/freebox/strings.json
index 9f402a7d1e6..bad618321e4 100644
--- a/homeassistant/components/freebox/strings.json
+++ b/homeassistant/components/freebox/strings.json
@@ -1,6 +1,6 @@
 {
+  "title": "Freebox",
   "config": {
-    "title": "Freebox",
     "step": {
       "user": {
         "title": "Freebox",
diff --git a/homeassistant/components/garmin_connect/strings.json b/homeassistant/components/garmin_connect/strings.json
index faf463ea8db..b0571bb7d80 100644
--- a/homeassistant/components/garmin_connect/strings.json
+++ b/homeassistant/components/garmin_connect/strings.json
@@ -1,4 +1,5 @@
 {
+  "title": "Garmin Connect",
   "config": {
     "abort": {
       "already_configured": "This account is already configured."
@@ -18,7 +19,6 @@
         "description": "Enter your credentials.",
         "title": "Garmin Connect"
       }
-    },
-    "title": "Garmin Connect"
+    }
   }
 }
diff --git a/homeassistant/components/gdacs/strings.json b/homeassistant/components/gdacs/strings.json
index 353b1b85634..809d87e13cc 100644
--- a/homeassistant/components/gdacs/strings.json
+++ b/homeassistant/components/gdacs/strings.json
@@ -1,6 +1,6 @@
 {
+  "title": "Global Disaster Alert and Coordination System (GDACS)",
   "config": {
-    "title": "Global Disaster Alert and Coordination System (GDACS)",
     "step": {
       "user": {
         "title": "Fill in your filter details.",
diff --git a/homeassistant/components/geofency/strings.json b/homeassistant/components/geofency/strings.json
index 7951df50e5e..784fa3d0056 100644
--- a/homeassistant/components/geofency/strings.json
+++ b/homeassistant/components/geofency/strings.json
@@ -1,6 +1,6 @@
 {
+  "title": "Geofency Webhook",
   "config": {
-    "title": "Geofency Webhook",
     "step": {
       "user": {
         "title": "Set up the Geofency Webhook",
diff --git a/homeassistant/components/geonetnz_quakes/strings.json b/homeassistant/components/geonetnz_quakes/strings.json
index 9c5ea291897..46dd3f25ded 100644
--- a/homeassistant/components/geonetnz_quakes/strings.json
+++ b/homeassistant/components/geonetnz_quakes/strings.json
@@ -1,6 +1,6 @@
 {
+  "title": "GeoNet NZ Quakes",
   "config": {
-    "title": "GeoNet NZ Quakes",
     "step": {
       "user": {
         "title": "Fill in your filter details.",
diff --git a/homeassistant/components/geonetnz_volcano/strings.json b/homeassistant/components/geonetnz_volcano/strings.json
index 93ec8603d03..62537be6024 100644
--- a/homeassistant/components/geonetnz_volcano/strings.json
+++ b/homeassistant/components/geonetnz_volcano/strings.json
@@ -1,6 +1,6 @@
 {
+  "title": "GeoNet NZ Volcano",
   "config": {
-    "title": "GeoNet NZ Volcano",
     "step": {
       "user": {
         "title": "Fill in your filter details.",
diff --git a/homeassistant/components/gios/strings.json b/homeassistant/components/gios/strings.json
index 2442fa61a91..0519eec87d3 100644
--- a/homeassistant/components/gios/strings.json
+++ b/homeassistant/components/gios/strings.json
@@ -1,6 +1,6 @@
 {
+  "title": "$1",
   "config": {
-    "title": "GIOŚ",
     "step": {
       "user": {
         "title": "GIOŚ (Polish Chief Inspectorate Of Environmental Protection)",
diff --git a/homeassistant/components/glances/strings.json b/homeassistant/components/glances/strings.json
index 3ec324f9cd6..8c1078fb834 100644
--- a/homeassistant/components/glances/strings.json
+++ b/homeassistant/components/glances/strings.json
@@ -1,6 +1,6 @@
 {
+  "title": "Glances",
   "config": {
-    "title": "Glances",
     "step": {
       "user": {
         "title": "Setup Glances",
diff --git a/homeassistant/components/gpslogger/strings.json b/homeassistant/components/gpslogger/strings.json
index add0ad31cbb..dfa66b5844f 100644
--- a/homeassistant/components/gpslogger/strings.json
+++ b/homeassistant/components/gpslogger/strings.json
@@ -1,6 +1,6 @@
 {
+  "title": "GPSLogger Webhook",
   "config": {
-    "title": "GPSLogger Webhook",
     "step": {
       "user": {
         "title": "Set up the GPSLogger Webhook",
diff --git a/homeassistant/components/griddy/strings.json b/homeassistant/components/griddy/strings.json
index ee4df700f79..c7565881a82 100644
--- a/homeassistant/components/griddy/strings.json
+++ b/homeassistant/components/griddy/strings.json
@@ -1,10 +1,10 @@
 {
+  "title": "Griddy",
   "config": {
     "error": {
       "cannot_connect": "Failed to connect, please try again",
       "unknown": "Unexpected error"
     },
-    "title": "Griddy",
     "step": {
       "user": {
         "description": "Your Load Zone is in your Griddy account under “Account > Meter > Load Zone.”",
diff --git a/homeassistant/components/hangouts/strings.json b/homeassistant/components/hangouts/strings.json
index 7bd67a7a2c8..13771825fc0 100644
--- a/homeassistant/components/hangouts/strings.json
+++ b/homeassistant/components/hangouts/strings.json
@@ -1,4 +1,5 @@
 {
+  "title": "Google Hangouts",
   "config": {
     "abort": {
       "already_configured": "Google Hangouts is already configured",
@@ -24,7 +25,6 @@
         },
         "title": "2-Factor-Authentication"
       }
-    },
-    "title": "Google Hangouts"
+    }
   }
 }
diff --git a/homeassistant/components/harmony/strings.json b/homeassistant/components/harmony/strings.json
index 8af5a5ada1a..a486772139d 100644
--- a/homeassistant/components/harmony/strings.json
+++ b/homeassistant/components/harmony/strings.json
@@ -1,6 +1,6 @@
 {
+  "title": "Logitech Harmony Hub",
   "config": {
-    "title": "Logitech Harmony Hub",
     "flow_title": "Logitech Harmony Hub {name}",
     "step": {
       "user": {
diff --git a/homeassistant/components/heos/strings.json b/homeassistant/components/heos/strings.json
index 28b404acdbd..12bc234fc4d 100644
--- a/homeassistant/components/heos/strings.json
+++ b/homeassistant/components/heos/strings.json
@@ -1,6 +1,6 @@
 {
+  "title": "HEOS",
   "config": {
-    "title": "HEOS",
     "step": {
       "user": {
         "title": "Connect to Heos",
diff --git a/homeassistant/components/hisense_aehw4a1/strings.json b/homeassistant/components/hisense_aehw4a1/strings.json
index 67031c41710..1d92864aa27 100644
--- a/homeassistant/components/hisense_aehw4a1/strings.json
+++ b/homeassistant/components/hisense_aehw4a1/strings.json
@@ -1,6 +1,6 @@
 {
+  "title": "Hisense AEH-W4A1",
   "config": {
-    "title": "Hisense AEH-W4A1",
     "step": {
       "confirm": {
         "title": "Hisense AEH-W4A1",
diff --git a/homeassistant/components/homekit_controller/strings.json b/homeassistant/components/homekit_controller/strings.json
index 40295c74e0a..4d55ff328b8 100644
--- a/homeassistant/components/homekit_controller/strings.json
+++ b/homeassistant/components/homekit_controller/strings.json
@@ -1,6 +1,6 @@
 {
+  "title": "HomeKit Accessory",
   "config": {
-    "title": "HomeKit Accessory",
     "flow_title": "HomeKit Accessory: {name}",
     "step": {
       "user": {
diff --git a/homeassistant/components/homematicip_cloud/strings.json b/homeassistant/components/homematicip_cloud/strings.json
index f2d38a1dc7b..e269121086c 100644
--- a/homeassistant/components/homematicip_cloud/strings.json
+++ b/homeassistant/components/homematicip_cloud/strings.json
@@ -1,6 +1,6 @@
 {
+  "title": "HomematicIP Cloud",
   "config": {
-    "title": "HomematicIP Cloud",
     "step": {
       "init": {
         "title": "Pick HomematicIP Access point",
diff --git a/homeassistant/components/huawei_lte/strings.json b/homeassistant/components/huawei_lte/strings.json
index a23c2a9184f..4c613a286d6 100644
--- a/homeassistant/components/huawei_lte/strings.json
+++ b/homeassistant/components/huawei_lte/strings.json
@@ -1,4 +1,5 @@
 {
+  "title": "Huawei LTE",
   "config": {
     "abort": {
       "already_configured": "This device has already been configured",
@@ -26,8 +27,7 @@
         "description": "Enter device access details. Specifying username and password is optional, but enables support for more integration features. On the other hand, use of an authorized connection may cause problems accessing the device web interface from outside Home Assistant while the integration is active, and the other way around.",
         "title": "Configure Huawei LTE"
       }
-    },
-    "title": "Huawei LTE"
+    }
   },
   "options": {
     "step": {
diff --git a/homeassistant/components/hue/strings.json b/homeassistant/components/hue/strings.json
index 9f23f056894..620207c14bf 100644
--- a/homeassistant/components/hue/strings.json
+++ b/homeassistant/components/hue/strings.json
@@ -1,6 +1,6 @@
 {
+  "title": "Philips Hue",
   "config": {
-    "title": "Philips Hue",
     "step": {
       "init": {
         "title": "Pick Hue bridge",
diff --git a/homeassistant/components/iaqualink/strings.json b/homeassistant/components/iaqualink/strings.json
index 4c706522198..185e9ab5498 100644
--- a/homeassistant/components/iaqualink/strings.json
+++ b/homeassistant/components/iaqualink/strings.json
@@ -1,6 +1,6 @@
 {
+  "title": "Jandy iAqualink",
   "config": {
-    "title": "Jandy iAqualink",
     "step": {
       "user": {
         "title": "Connect to iAqualink",
diff --git a/homeassistant/components/icloud/strings.json b/homeassistant/components/icloud/strings.json
index abf47e5744f..d0f343a21f6 100644
--- a/homeassistant/components/icloud/strings.json
+++ b/homeassistant/components/icloud/strings.json
@@ -1,6 +1,6 @@
 {
+  "title": "Apple iCloud",
   "config": {
-    "title": "Apple iCloud",
     "step": {
       "user": {
         "title": "iCloud credentials",
diff --git a/homeassistant/components/ifttt/strings.json b/homeassistant/components/ifttt/strings.json
index 9fc47504b9b..2039f3f39ff 100644
--- a/homeassistant/components/ifttt/strings.json
+++ b/homeassistant/components/ifttt/strings.json
@@ -1,6 +1,6 @@
 {
+  "title": "IFTTT",
   "config": {
-    "title": "IFTTT",
     "step": {
       "user": {
         "title": "Set up the IFTTT Webhook Applet",
diff --git a/homeassistant/components/ios/strings.json b/homeassistant/components/ios/strings.json
index cbb63cf8229..53ba28972ee 100644
--- a/homeassistant/components/ios/strings.json
+++ b/homeassistant/components/ios/strings.json
@@ -1,6 +1,6 @@
 {
+  "title": "Home Assistant iOS",
   "config": {
-    "title": "Home Assistant iOS",
     "step": {
       "confirm": {
         "title": "Home Assistant iOS",
diff --git a/homeassistant/components/ipma/strings.json b/homeassistant/components/ipma/strings.json
index 184b7e38946..78471e703ba 100644
--- a/homeassistant/components/ipma/strings.json
+++ b/homeassistant/components/ipma/strings.json
@@ -1,6 +1,6 @@
 {
+  "title": "Portuguese weather service (IPMA)",
   "config": {
-    "title": "Portuguese weather service (IPMA)",
     "step": {
       "user": {
         "title": "Location",
diff --git a/homeassistant/components/ipp/strings.json b/homeassistant/components/ipp/strings.json
index c77d1eec161..0e6a005d3ed 100644
--- a/homeassistant/components/ipp/strings.json
+++ b/homeassistant/components/ipp/strings.json
@@ -1,6 +1,6 @@
 {
+  "title": "Internet Printing Protocol (IPP)",
   "config": {
-    "title": "Internet Printing Protocol (IPP)",
     "flow_title": "Printer: {name}",
     "step": {
       "user": {
diff --git a/homeassistant/components/iqvia/strings.json b/homeassistant/components/iqvia/strings.json
index 00f383be502..62ceae7753b 100644
--- a/homeassistant/components/iqvia/strings.json
+++ b/homeassistant/components/iqvia/strings.json
@@ -1,6 +1,6 @@
 {
+  "title": "IQVIA",
   "config": {
-    "title": "IQVIA",
     "step": {
       "user": {
         "title": "IQVIA",
diff --git a/homeassistant/components/izone/strings.json b/homeassistant/components/izone/strings.json
index 7cb14b03c6c..7af3fffd09a 100644
--- a/homeassistant/components/izone/strings.json
+++ b/homeassistant/components/izone/strings.json
@@ -1,6 +1,6 @@
 {
+  "title": "iZone",
   "config": {
-    "title": "iZone",
     "step": {
       "confirm": {
         "title": "iZone",
diff --git a/homeassistant/components/konnected/strings.json b/homeassistant/components/konnected/strings.json
index 0ea8a40bc0a..cb1cd5df8bf 100644
--- a/homeassistant/components/konnected/strings.json
+++ b/homeassistant/components/konnected/strings.json
@@ -1,6 +1,6 @@
 {
+  "title": "Konnected.io",
   "config": {
-    "title": "Konnected.io",
     "step": {
       "import_confirm": {
         "title": "Import Konnected Device",
@@ -30,7 +30,6 @@
     }
   },
   "options": {
-    "title": "Konnected Alarm Panel Options",
     "step": {
       "options_io": {
         "title": "Configure I/O",
diff --git a/homeassistant/components/life360/strings.json b/homeassistant/components/life360/strings.json
index 419f3650333..10735b7f454 100644
--- a/homeassistant/components/life360/strings.json
+++ b/homeassistant/components/life360/strings.json
@@ -1,6 +1,6 @@
 {
+  "title": "Life360",
   "config": {
-    "title": "Life360",
     "step": {
       "user": {
         "title": "Life360 Account Info",
diff --git a/homeassistant/components/lifx/strings.json b/homeassistant/components/lifx/strings.json
index 300c9b628f3..d111aa9583e 100644
--- a/homeassistant/components/lifx/strings.json
+++ b/homeassistant/components/lifx/strings.json
@@ -1,6 +1,6 @@
 {
+  "title": "LIFX",
   "config": {
-    "title": "LIFX",
     "step": {
       "confirm": {
         "title": "LIFX",
diff --git a/homeassistant/components/linky/strings.json b/homeassistant/components/linky/strings.json
index 6d53e4f12a5..e50a20aefcd 100644
--- a/homeassistant/components/linky/strings.json
+++ b/homeassistant/components/linky/strings.json
@@ -1,6 +1,6 @@
 {
+  "title": "Linky",
   "config": {
-    "title": "Linky",
     "step": {
       "user": {
         "title": "Linky",
diff --git a/homeassistant/components/local_ip/strings.json b/homeassistant/components/local_ip/strings.json
index f8e907b46d5..2c571be1a0a 100644
--- a/homeassistant/components/local_ip/strings.json
+++ b/homeassistant/components/local_ip/strings.json
@@ -1,6 +1,6 @@
 {
+  "title": "Local IP Address",
   "config": {
-    "title": "Local IP Address",
     "step": {
       "user": {
         "title": "Local IP Address",
diff --git a/homeassistant/components/locative/strings.json b/homeassistant/components/locative/strings.json
index 4e7bd5729f4..07ca5431869 100644
--- a/homeassistant/components/locative/strings.json
+++ b/homeassistant/components/locative/strings.json
@@ -1,6 +1,6 @@
 {
+  "title": "Locative Webhook",
   "config": {
-    "title": "Locative Webhook",
     "step": {
       "user": {
         "title": "Set up the Locative Webhook",
diff --git a/homeassistant/components/logi_circle/strings.json b/homeassistant/components/logi_circle/strings.json
index 57dd0b709b7..f580e7bc1dd 100644
--- a/homeassistant/components/logi_circle/strings.json
+++ b/homeassistant/components/logi_circle/strings.json
@@ -1,6 +1,6 @@
 {
+  "title": "Logi Circle",
   "config": {
-    "title": "Logi Circle",
     "step": {
       "user": {
         "title": "Authentication Provider",
diff --git a/homeassistant/components/luftdaten/strings.json b/homeassistant/components/luftdaten/strings.json
index 96d24139c25..8e4acd1ad96 100644
--- a/homeassistant/components/luftdaten/strings.json
+++ b/homeassistant/components/luftdaten/strings.json
@@ -1,6 +1,6 @@
 {
+  "title": "Luftdaten",
   "config": {
-    "title": "Luftdaten",
     "step": {
       "user": {
         "title": "Define Luftdaten",
diff --git a/homeassistant/components/lutron_caseta/strings.json b/homeassistant/components/lutron_caseta/strings.json
index 5d7ddc8b55b..354c69cd55a 100644
--- a/homeassistant/components/lutron_caseta/strings.json
+++ b/homeassistant/components/lutron_caseta/strings.json
@@ -1,5 +1,3 @@
 {
-  "config": {
-    "title": "Lutron Caséta"
-  }
+  "title": "Lutron Caséta"
 }
diff --git a/homeassistant/components/mailgun/strings.json b/homeassistant/components/mailgun/strings.json
index c72ec747b30..8afa6eaed25 100644
--- a/homeassistant/components/mailgun/strings.json
+++ b/homeassistant/components/mailgun/strings.json
@@ -1,6 +1,6 @@
 {
+  "title": "Mailgun",
   "config": {
-    "title": "Mailgun",
     "step": {
       "user": {
         "title": "Set up the Mailgun Webhook",
diff --git a/homeassistant/components/melcloud/strings.json b/homeassistant/components/melcloud/strings.json
index 477ca7eb5e2..5afa10f3aa5 100644
--- a/homeassistant/components/melcloud/strings.json
+++ b/homeassistant/components/melcloud/strings.json
@@ -1,6 +1,6 @@
 {
+  "title": "MELCloud",
   "config": {
-    "title": "MELCloud",
     "step": {
       "user": {
         "title": "Connect to MELCloud",
diff --git a/homeassistant/components/met/strings.json b/homeassistant/components/met/strings.json
index cadfd03e9d2..a5f0c6ce381 100644
--- a/homeassistant/components/met/strings.json
+++ b/homeassistant/components/met/strings.json
@@ -1,6 +1,6 @@
 {
+  "title": "Met.no",
   "config": {
-    "title": "Met.no",
     "step": {
       "user": {
         "title": "Location",
diff --git a/homeassistant/components/meteo_france/strings.json b/homeassistant/components/meteo_france/strings.json
index 91950f62369..0cd5c7d8da2 100644
--- a/homeassistant/components/meteo_france/strings.json
+++ b/homeassistant/components/meteo_france/strings.json
@@ -1,6 +1,6 @@
 {
+  "title": "Météo-France",
   "config": {
-    "title": "Météo-France",
     "step": {
       "user": {
         "title": "Météo-France",
diff --git a/homeassistant/components/mikrotik/strings.json b/homeassistant/components/mikrotik/strings.json
index 0d6fc42d1a3..c0c77261e5a 100644
--- a/homeassistant/components/mikrotik/strings.json
+++ b/homeassistant/components/mikrotik/strings.json
@@ -1,6 +1,6 @@
 {
+  "title": "Mikrotik",
   "config": {
-    "title": "Mikrotik",
     "step": {
       "user": {
         "title": "Set up Mikrotik Router",
diff --git a/homeassistant/components/minecraft_server/strings.json b/homeassistant/components/minecraft_server/strings.json
index 39dc17e66d5..650f95198d5 100644
--- a/homeassistant/components/minecraft_server/strings.json
+++ b/homeassistant/components/minecraft_server/strings.json
@@ -1,6 +1,6 @@
 {
+  "title": "Minecraft Server",
   "config": {
-    "title": "Minecraft Server",
     "step": {
       "user": {
         "title": "Link your Minecraft Server",
diff --git a/homeassistant/components/mobile_app/strings.json b/homeassistant/components/mobile_app/strings.json
index 646151a5229..17a390fb575 100644
--- a/homeassistant/components/mobile_app/strings.json
+++ b/homeassistant/components/mobile_app/strings.json
@@ -1,6 +1,6 @@
 {
+  "title": "Mobile App",
   "config": {
-    "title": "Mobile App",
     "step": {
       "confirm": {
         "title": "Mobile App",
diff --git a/homeassistant/components/monoprice/strings.json b/homeassistant/components/monoprice/strings.json
index 7842f858fd8..fb7739546c3 100644
--- a/homeassistant/components/monoprice/strings.json
+++ b/homeassistant/components/monoprice/strings.json
@@ -1,6 +1,6 @@
 {
+  "title": "Monoprice 6-Zone Amplifier",
   "config": {
-    "title": "Monoprice 6-Zone Amplifier",
     "step": {
       "user": {
         "title": "Connect to the device",
diff --git a/homeassistant/components/mqtt/strings.json b/homeassistant/components/mqtt/strings.json
index f0a38bcbc55..7d55bd448b7 100644
--- a/homeassistant/components/mqtt/strings.json
+++ b/homeassistant/components/mqtt/strings.json
@@ -1,6 +1,6 @@
 {
+  "title": "MQTT",
   "config": {
-    "title": "MQTT",
     "step": {
       "broker": {
         "title": "MQTT",
diff --git a/homeassistant/components/myq/strings.json b/homeassistant/components/myq/strings.json
index 2aa0eab328e..47157e64d96 100644
--- a/homeassistant/components/myq/strings.json
+++ b/homeassistant/components/myq/strings.json
@@ -1,6 +1,6 @@
 {
+  "title": "MyQ",
   "config": {
-    "title": "MyQ",
     "step": {
       "user": {
         "title": "Connect to the MyQ Gateway",
diff --git a/homeassistant/components/neato/strings.json b/homeassistant/components/neato/strings.json
index 9e6a0cb2709..5346e2da3ac 100644
--- a/homeassistant/components/neato/strings.json
+++ b/homeassistant/components/neato/strings.json
@@ -1,6 +1,6 @@
 {
+  "title": "Neato",
   "config": {
-    "title": "Neato",
     "step": {
       "user": {
         "title": "Neato Account Info",
diff --git a/homeassistant/components/nest/strings.json b/homeassistant/components/nest/strings.json
index 1e6700267f8..bacd16f5f29 100644
--- a/homeassistant/components/nest/strings.json
+++ b/homeassistant/components/nest/strings.json
@@ -1,6 +1,6 @@
 {
+  "title": "Nest",
   "config": {
-    "title": "Nest",
     "step": {
       "init": {
         "title": "Authentication Provider",
diff --git a/homeassistant/components/netatmo/strings.json b/homeassistant/components/netatmo/strings.json
index 5ba3fff7fe2..4261608e248 100644
--- a/homeassistant/components/netatmo/strings.json
+++ b/homeassistant/components/netatmo/strings.json
@@ -1,6 +1,6 @@
 {
+  "title": "Netatmo",
   "config": {
-    "title": "Netatmo",
     "step": {
       "pick_implementation": {
         "title": "Pick Authentication Method"
diff --git a/homeassistant/components/nexia/strings.json b/homeassistant/components/nexia/strings.json
index 8bdb3ea90b9..dc9b4833aab 100644
--- a/homeassistant/components/nexia/strings.json
+++ b/homeassistant/components/nexia/strings.json
@@ -1,6 +1,6 @@
 {
+  "title": "Nexia",
   "config": {
-    "title": "Nexia",
     "step": {
       "user": {
         "title": "Connect to mynexia.com",
diff --git a/homeassistant/components/notion/strings.json b/homeassistant/components/notion/strings.json
index fa47c2819ba..5c70e37ddb0 100644
--- a/homeassistant/components/notion/strings.json
+++ b/homeassistant/components/notion/strings.json
@@ -1,6 +1,6 @@
 {
+  "title": "Notion",
   "config": {
-    "title": "Notion",
     "step": {
       "user": {
         "title": "Fill in your information",
diff --git a/homeassistant/components/nuheat/strings.json b/homeassistant/components/nuheat/strings.json
index 3effdbc60d6..a3b34456b0b 100644
--- a/homeassistant/components/nuheat/strings.json
+++ b/homeassistant/components/nuheat/strings.json
@@ -1,4 +1,5 @@
 {
+  "title": "NuHeat",
   "config": {
     "error": {
       "unknown": "Unexpected error",
@@ -6,7 +7,6 @@
       "invalid_auth": "Invalid authentication",
       "invalid_thermostat": "The thermostat serial number is invalid."
     },
-    "title": "NuHeat",
     "abort": {
       "already_configured": "The thermostat is already configured"
     },
diff --git a/homeassistant/components/nut/strings.json b/homeassistant/components/nut/strings.json
index 206a1ec299a..ef942394a56 100644
--- a/homeassistant/components/nut/strings.json
+++ b/homeassistant/components/nut/strings.json
@@ -1,6 +1,6 @@
 {
+  "title": "Network UPS Tools (NUT)",
   "config": {
-    "title": "Network UPS Tools (NUT)",
     "step": {
       "user": {
         "title": "Connect to the NUT server",
diff --git a/homeassistant/components/opentherm_gw/strings.json b/homeassistant/components/opentherm_gw/strings.json
index 7bc25726f27..4b257eca748 100644
--- a/homeassistant/components/opentherm_gw/strings.json
+++ b/homeassistant/components/opentherm_gw/strings.json
@@ -1,6 +1,6 @@
 {
+  "title": "OpenTherm Gateway",
   "config": {
-    "title": "OpenTherm Gateway",
     "step": {
       "init": {
         "title": "OpenTherm Gateway",
diff --git a/homeassistant/components/openuv/strings.json b/homeassistant/components/openuv/strings.json
index 9c5af45619e..8692c42127f 100644
--- a/homeassistant/components/openuv/strings.json
+++ b/homeassistant/components/openuv/strings.json
@@ -1,6 +1,6 @@
 {
+  "title": "OpenUV",
   "config": {
-    "title": "OpenUV",
     "step": {
       "user": {
         "title": "Fill in your information",
diff --git a/homeassistant/components/owntracks/strings.json b/homeassistant/components/owntracks/strings.json
index fcf7305d714..a79bee5ce63 100644
--- a/homeassistant/components/owntracks/strings.json
+++ b/homeassistant/components/owntracks/strings.json
@@ -1,6 +1,6 @@
 {
+  "title": "OwnTracks",
   "config": {
-    "title": "OwnTracks",
     "step": {
       "user": {
         "title": "Set up OwnTracks",
diff --git a/homeassistant/components/plaato/strings.json b/homeassistant/components/plaato/strings.json
index 2fde2782f46..697b1466ef0 100644
--- a/homeassistant/components/plaato/strings.json
+++ b/homeassistant/components/plaato/strings.json
@@ -1,6 +1,6 @@
 {
+  "title": "Plaato Airlock",
   "config": {
-    "title": "Plaato Airlock",
     "step": {
       "user": {
         "title": "Set up the Plaato Webhook",
diff --git a/homeassistant/components/plex/strings.json b/homeassistant/components/plex/strings.json
index 83466327da3..2952c8436a6 100644
--- a/homeassistant/components/plex/strings.json
+++ b/homeassistant/components/plex/strings.json
@@ -1,6 +1,6 @@
 {
+  "title": "Plex",
   "config": {
-    "title": "Plex",
     "step": {
       "select_server": {
         "title": "Select Plex server",
diff --git a/homeassistant/components/point/strings.json b/homeassistant/components/point/strings.json
index e5491a8bbee..fc7f189bd0e 100644
--- a/homeassistant/components/point/strings.json
+++ b/homeassistant/components/point/strings.json
@@ -1,6 +1,6 @@
 {
+  "title": "Minut Point",
   "config": {
-    "title": "Minut Point",
     "step": {
       "user": {
         "title": "Authentication Provider",
diff --git a/homeassistant/components/powerwall/strings.json b/homeassistant/components/powerwall/strings.json
index 92f0fd19464..66ed7edff44 100644
--- a/homeassistant/components/powerwall/strings.json
+++ b/homeassistant/components/powerwall/strings.json
@@ -1,6 +1,6 @@
 {
+  "title": "Tesla Powerwall",
   "config": {
-    "title": "Tesla Powerwall",
     "step": {
       "user": {
         "title": "Connect to the powerwall",
diff --git a/homeassistant/components/ps4/strings.json b/homeassistant/components/ps4/strings.json
index 77443b1ee9a..ff7d2d82f05 100644
--- a/homeassistant/components/ps4/strings.json
+++ b/homeassistant/components/ps4/strings.json
@@ -1,6 +1,6 @@
 {
+  "title": "PlayStation 4",
   "config": {
-    "title": "PlayStation 4",
     "step": {
       "creds": {
         "title": "PlayStation 4",
diff --git a/homeassistant/components/pvpc_hourly_pricing/strings.json b/homeassistant/components/pvpc_hourly_pricing/strings.json
index bff5dc2e68f..44d3ec5f525 100644
--- a/homeassistant/components/pvpc_hourly_pricing/strings.json
+++ b/homeassistant/components/pvpc_hourly_pricing/strings.json
@@ -1,6 +1,6 @@
 {
+  "title": "Hourly price of electricity in Spain (PVPC)",
   "config": {
-    "title": "Hourly price of electricity in Spain (PVPC)",
     "step": {
       "user": {
         "title": "Tariff selection",
diff --git a/homeassistant/components/rachio/strings.json b/homeassistant/components/rachio/strings.json
index 1f05a1c7a5f..f905f7810d3 100644
--- a/homeassistant/components/rachio/strings.json
+++ b/homeassistant/components/rachio/strings.json
@@ -1,6 +1,6 @@
 {
+  "title": "Rachio",
   "config": {
-    "title": "Rachio",
     "step": {
       "user": {
         "title": "Connect to your Rachio device",
diff --git a/homeassistant/components/rainmachine/strings.json b/homeassistant/components/rainmachine/strings.json
index 7195cce2e31..10e7e2e1400 100644
--- a/homeassistant/components/rainmachine/strings.json
+++ b/homeassistant/components/rainmachine/strings.json
@@ -1,6 +1,6 @@
 {
+  "title": "RainMachine",
   "config": {
-    "title": "RainMachine",
     "step": {
       "user": {
         "title": "Fill in your information",
diff --git a/homeassistant/components/ring/strings.json b/homeassistant/components/ring/strings.json
index 6dff7c00ba6..9ba9bbf49c1 100644
--- a/homeassistant/components/ring/strings.json
+++ b/homeassistant/components/ring/strings.json
@@ -1,6 +1,6 @@
 {
+  "title": "Ring",
   "config": {
-    "title": "Ring",
     "step": {
       "user": {
         "title": "Sign-in with Ring account",
diff --git a/homeassistant/components/roku/strings.json b/homeassistant/components/roku/strings.json
index 17072850259..8494f350b2c 100644
--- a/homeassistant/components/roku/strings.json
+++ b/homeassistant/components/roku/strings.json
@@ -1,6 +1,6 @@
 {
+  "title": "Roku",
   "config": {
-    "title": "Roku",
     "flow_title": "Roku: {name}",
     "step": {
       "user": {
diff --git a/homeassistant/components/roomba/strings.json b/homeassistant/components/roomba/strings.json
index 403d1980b94..7d55b1f304e 100644
--- a/homeassistant/components/roomba/strings.json
+++ b/homeassistant/components/roomba/strings.json
@@ -1,6 +1,6 @@
 {
+  "title": "iRobot Roomba",
   "config": {
-    "title": "iRobot Roomba",
     "step": {
       "user": {
         "title": "Connect to the device",
diff --git a/homeassistant/components/samsungtv/strings.json b/homeassistant/components/samsungtv/strings.json
index 71de0764789..8a3d44f6229 100644
--- a/homeassistant/components/samsungtv/strings.json
+++ b/homeassistant/components/samsungtv/strings.json
@@ -1,7 +1,7 @@
 {
+  "title": "Samsung TV",
   "config": {
     "flow_title": "Samsung TV: {model}",
-    "title": "Samsung TV",
     "step": {
       "user": {
         "title": "Samsung TV",
diff --git a/homeassistant/components/sense/strings.json b/homeassistant/components/sense/strings.json
index d3af47b5378..0577fc7d24e 100644
--- a/homeassistant/components/sense/strings.json
+++ b/homeassistant/components/sense/strings.json
@@ -1,6 +1,6 @@
 {
+  "title": "Sense",
   "config": {
-    "title": "Sense",
     "step": {
       "user": {
         "title": "Connect to your Sense Energy Monitor",
diff --git a/homeassistant/components/sentry/strings.json b/homeassistant/components/sentry/strings.json
index 8d5042731ca..d6dc5a3af15 100644
--- a/homeassistant/components/sentry/strings.json
+++ b/homeassistant/components/sentry/strings.json
@@ -1,6 +1,6 @@
 {
+  "title": "Sentry",
   "config": {
-    "title": "Sentry",
     "step": {
       "user": {
         "title": "Sentry",
diff --git a/homeassistant/components/shopping_list/strings.json b/homeassistant/components/shopping_list/strings.json
index 537bed16a78..8c17d683886 100644
--- a/homeassistant/components/shopping_list/strings.json
+++ b/homeassistant/components/shopping_list/strings.json
@@ -1,6 +1,6 @@
 {
+  "title": "Shopping List",
   "config": {
-    "title": "Shopping List",
     "step": {
       "user": {
         "title": "Shopping List",
diff --git a/homeassistant/components/simplisafe/strings.json b/homeassistant/components/simplisafe/strings.json
index 1c8aadc2192..7ffb6dfbe1a 100644
--- a/homeassistant/components/simplisafe/strings.json
+++ b/homeassistant/components/simplisafe/strings.json
@@ -1,6 +1,6 @@
 {
+  "title": "SimpliSafe",
   "config": {
-    "title": "SimpliSafe",
     "step": {
       "user": {
         "title": "Fill in your information",
diff --git a/homeassistant/components/smartthings/strings.json b/homeassistant/components/smartthings/strings.json
index 94a8f0c8bc4..31357050624 100644
--- a/homeassistant/components/smartthings/strings.json
+++ b/homeassistant/components/smartthings/strings.json
@@ -1,6 +1,6 @@
 {
+  "title": "SmartThings",
   "config": {
-    "title": "SmartThings",
     "step": {
       "user": {
         "title": "Confirm Callback URL",
diff --git a/homeassistant/components/smhi/strings.json b/homeassistant/components/smhi/strings.json
index 2db9e0f94eb..015b24848af 100644
--- a/homeassistant/components/smhi/strings.json
+++ b/homeassistant/components/smhi/strings.json
@@ -1,6 +1,6 @@
 {
+  "title": "Swedish weather service (SMHI)",
   "config": {
-    "title": "Swedish weather service (SMHI)",
     "step": {
       "user": {
         "title": "Location in Sweden",
diff --git a/homeassistant/components/solaredge/strings.json b/homeassistant/components/solaredge/strings.json
index 650ae3edd4f..ba02a718cbf 100644
--- a/homeassistant/components/solaredge/strings.json
+++ b/homeassistant/components/solaredge/strings.json
@@ -1,6 +1,6 @@
 {
+  "title": "SolarEdge",
   "config": {
-    "title": "SolarEdge",
     "step": {
       "user": {
         "title": "Define the API parameters for this installation",
diff --git a/homeassistant/components/solarlog/strings.json b/homeassistant/components/solarlog/strings.json
index 5399d5176c9..fe4b8540f4b 100644
--- a/homeassistant/components/solarlog/strings.json
+++ b/homeassistant/components/solarlog/strings.json
@@ -1,6 +1,6 @@
 {
+  "title": "Solar-Log",
   "config": {
-    "title": "Solar-Log",
     "step": {
       "user": {
         "title": "Define your Solar-Log connection",
diff --git a/homeassistant/components/soma/strings.json b/homeassistant/components/soma/strings.json
index 74a72fdd976..50570f8f396 100644
--- a/homeassistant/components/soma/strings.json
+++ b/homeassistant/components/soma/strings.json
@@ -1,4 +1,5 @@
 {
+  "title": "Soma",
   "config": {
     "abort": {
       "already_setup": "You can only configure one Soma account.",
@@ -19,7 +20,6 @@
         "description": "Please enter connection settings of your SOMA Connect.",
         "title": "SOMA Connect"
       }
-    },
-    "title": "Soma"
+    }
   }
 }
diff --git a/homeassistant/components/somfy/strings.json b/homeassistant/components/somfy/strings.json
index 81308ba18af..2b6dff2c0fa 100644
--- a/homeassistant/components/somfy/strings.json
+++ b/homeassistant/components/somfy/strings.json
@@ -1,4 +1,5 @@
 {
+  "title": "Somfy",
   "config": {
     "step": {
       "pick_implementation": {
@@ -12,7 +13,6 @@
     },
     "create_entry": {
       "default": "Successfully authenticated with Somfy."
-    },
-    "title": "Somfy"
+    }
   }
 }
diff --git a/homeassistant/components/sonos/strings.json b/homeassistant/components/sonos/strings.json
index 0422919c1aa..e5b81fe2c9a 100644
--- a/homeassistant/components/sonos/strings.json
+++ b/homeassistant/components/sonos/strings.json
@@ -1,6 +1,6 @@
 {
+  "title": "Sonos",
   "config": {
-    "title": "Sonos",
     "step": {
       "confirm": {
         "title": "Sonos",
diff --git a/homeassistant/components/spotify/strings.json b/homeassistant/components/spotify/strings.json
index 316fbd946db..fe12c6cedad 100644
--- a/homeassistant/components/spotify/strings.json
+++ b/homeassistant/components/spotify/strings.json
@@ -1,4 +1,5 @@
 {
+  "title": "Spotify",
   "config": {
     "step": {
       "pick_implementation": {
@@ -12,7 +13,6 @@
     },
     "create_entry": {
       "default": "Successfully authenticated with Spotify."
-    },
-    "title": "Spotify"
+    }
   }
 }
diff --git a/homeassistant/components/starline/strings.json b/homeassistant/components/starline/strings.json
index 673fc6f54bd..d5119949953 100644
--- a/homeassistant/components/starline/strings.json
+++ b/homeassistant/components/starline/strings.json
@@ -1,6 +1,6 @@
 {
+  "title": "StarLine",
   "config": {
-    "title": "StarLine",
     "step": {
       "auth_app": {
         "title": "Application credentials",
diff --git a/homeassistant/components/synology_dsm/strings.json b/homeassistant/components/synology_dsm/strings.json
index 77bd1250033..49d9e2974ef 100644
--- a/homeassistant/components/synology_dsm/strings.json
+++ b/homeassistant/components/synology_dsm/strings.json
@@ -1,6 +1,6 @@
 {
+  "title": "Synology DSM",
   "config": {
-    "title": "Synology DSM",
     "flow_title": "Synology DSM {name} ({host})",
     "step": {
       "user": {
diff --git a/homeassistant/components/tado/strings.json b/homeassistant/components/tado/strings.json
index 697dadb4c7d..65d0462486d 100644
--- a/homeassistant/components/tado/strings.json
+++ b/homeassistant/components/tado/strings.json
@@ -1,4 +1,5 @@
 {
+  "title": "Tado",
   "config": {
     "abort": {
       "already_configured": "Device is already configured"
@@ -17,11 +18,9 @@
       "no_homes": "There are no homes linked to this tado account.",
       "invalid_auth": "Invalid authentication",
       "cannot_connect": "Failed to connect, please try again"
-    },
-    "title": "Tado"
+    }
   },
   "options": {
-    "title": "Tado",
     "step": {
       "init": {
         "description": "Fallback mode will switch to Smart Schedule at next schedule switch after manually adjusting a zone.",
diff --git a/homeassistant/components/tellduslive/strings.json b/homeassistant/components/tellduslive/strings.json
index 53a32812f60..3668209ac6c 100644
--- a/homeassistant/components/tellduslive/strings.json
+++ b/homeassistant/components/tellduslive/strings.json
@@ -1,4 +1,5 @@
 {
+  "title": "Telldus Live",
   "config": {
     "abort": {
       "already_setup": "TelldusLive is already configured",
@@ -20,7 +21,6 @@
         },
         "title": "Pick endpoint."
       }
-    },
-    "title": "Telldus Live"
+    }
   }
 }
diff --git a/homeassistant/components/tesla/strings.json b/homeassistant/components/tesla/strings.json
index 61cf5a2fcb2..5c66562cbbd 100644
--- a/homeassistant/components/tesla/strings.json
+++ b/homeassistant/components/tesla/strings.json
@@ -1,4 +1,5 @@
 {
+  "title": "Tesla",
   "config": {
     "error": {
       "connection_error": "Error connecting; check network and retry",
@@ -15,8 +16,7 @@
         "description": "Please enter your information.",
         "title": "Tesla - Configuration"
       }
-    },
-    "title": "Tesla"
+    }
   },
   "options": {
     "step": {
diff --git a/homeassistant/components/toon/strings.json b/homeassistant/components/toon/strings.json
index a12fce67ffd..11447a72d2a 100644
--- a/homeassistant/components/toon/strings.json
+++ b/homeassistant/components/toon/strings.json
@@ -1,6 +1,6 @@
 {
+  "title": "Toon",
   "config": {
-    "title": "Toon",
     "step": {
       "authenticate": {
         "title": "Link your Toon account",
diff --git a/homeassistant/components/totalconnect/strings.json b/homeassistant/components/totalconnect/strings.json
index 893aba77368..e2883db8d7d 100644
--- a/homeassistant/components/totalconnect/strings.json
+++ b/homeassistant/components/totalconnect/strings.json
@@ -1,6 +1,6 @@
 {
+  "title": "Total Connect",
   "config": {
-    "title": "Total Connect",
     "step": {
       "user": {
         "title": "Total Connect",
diff --git a/homeassistant/components/tplink/strings.json b/homeassistant/components/tplink/strings.json
index e353c1363ab..fd9f4c98243 100644
--- a/homeassistant/components/tplink/strings.json
+++ b/homeassistant/components/tplink/strings.json
@@ -1,6 +1,6 @@
 {
+  "title": "TP-Link Smart Home",
   "config": {
-    "title": "TP-Link Smart Home",
     "step": {
       "confirm": {
         "title": "TP-Link Smart Home",
diff --git a/homeassistant/components/traccar/strings.json b/homeassistant/components/traccar/strings.json
index 19f4eb0da22..f70795f2f63 100644
--- a/homeassistant/components/traccar/strings.json
+++ b/homeassistant/components/traccar/strings.json
@@ -1,6 +1,6 @@
 {
+  "title": "Traccar",
   "config": {
-    "title": "Traccar",
     "step": {
       "user": {
         "title": "Set up Traccar",
diff --git a/homeassistant/components/tradfri/strings.json b/homeassistant/components/tradfri/strings.json
index 868fbbed550..a4bf785dd4a 100644
--- a/homeassistant/components/tradfri/strings.json
+++ b/homeassistant/components/tradfri/strings.json
@@ -1,6 +1,6 @@
 {
+  "title": "$1",
   "config": {
-    "title": "IKEA TRÅDFRI",
     "step": {
       "auth": {
         "title": "Enter security code",
diff --git a/homeassistant/components/transmission/strings.json b/homeassistant/components/transmission/strings.json
index a239de65b6e..e5ea812a132 100644
--- a/homeassistant/components/transmission/strings.json
+++ b/homeassistant/components/transmission/strings.json
@@ -1,6 +1,6 @@
 {
+  "title": "Transmission",
   "config": {
-    "title": "Transmission",
     "step": {
       "user": {
         "title": "Setup Transmission Client",
diff --git a/homeassistant/components/twentemilieu/strings.json b/homeassistant/components/twentemilieu/strings.json
index 3ef76a5d20b..f5110e7bf88 100644
--- a/homeassistant/components/twentemilieu/strings.json
+++ b/homeassistant/components/twentemilieu/strings.json
@@ -1,6 +1,6 @@
 {
+  "title": "Twente Milieu",
   "config": {
-    "title": "Twente Milieu",
     "step": {
       "user": {
         "title": "Twente Milieu",
diff --git a/homeassistant/components/twilio/strings.json b/homeassistant/components/twilio/strings.json
index ca75fff0737..c766993d454 100644
--- a/homeassistant/components/twilio/strings.json
+++ b/homeassistant/components/twilio/strings.json
@@ -1,6 +1,6 @@
 {
+  "title": "Twilio",
   "config": {
-    "title": "Twilio",
     "step": {
       "user": {
         "title": "Set up the Twilio Webhook",
diff --git a/homeassistant/components/unifi/strings.json b/homeassistant/components/unifi/strings.json
index 881e97bc9ca..cb7767eba12 100644
--- a/homeassistant/components/unifi/strings.json
+++ b/homeassistant/components/unifi/strings.json
@@ -1,6 +1,6 @@
 {
+  "title": "UniFi Controller",
   "config": {
-    "title": "UniFi Controller",
     "step": {
       "user": {
         "title": "Set up UniFi Controller",
diff --git a/homeassistant/components/upnp/strings.json b/homeassistant/components/upnp/strings.json
index 628c0ea5a00..be5aab88f21 100644
--- a/homeassistant/components/upnp/strings.json
+++ b/homeassistant/components/upnp/strings.json
@@ -1,6 +1,6 @@
 {
+  "title": "UPnP/IGD",
   "config": {
-    "title": "UPnP/IGD",
     "step": {
       "init": {
         "title": "UPnP/IGD"
diff --git a/homeassistant/components/velbus/strings.json b/homeassistant/components/velbus/strings.json
index b927e6a5636..700fd26aaff 100644
--- a/homeassistant/components/velbus/strings.json
+++ b/homeassistant/components/velbus/strings.json
@@ -1,6 +1,6 @@
 {
+  "title": "Velbus interface",
   "config": {
-    "title": "Velbus interface",
     "step": {
       "user": {
         "title": "Define the velbus connection type",
diff --git a/homeassistant/components/vera/strings.json b/homeassistant/components/vera/strings.json
index d8dec2c40cf..17cb2ad85c6 100644
--- a/homeassistant/components/vera/strings.json
+++ b/homeassistant/components/vera/strings.json
@@ -1,6 +1,6 @@
 {
+  "title": "Vera",
   "config": {
-    "title": "Vera",
     "abort": {
       "already_configured": "A controller is already configured.",
       "cannot_connect": "Could not connect to controller with url {base_url}"
diff --git a/homeassistant/components/vesync/strings.json b/homeassistant/components/vesync/strings.json
index 4e656d35563..183892042b3 100644
--- a/homeassistant/components/vesync/strings.json
+++ b/homeassistant/components/vesync/strings.json
@@ -1,6 +1,6 @@
 {
+  "title": "VeSync",
   "config": {
-    "title": "VeSync",
     "step": {
       "user": {
         "title": "Enter Username and Password",
diff --git a/homeassistant/components/vilfo/strings.json b/homeassistant/components/vilfo/strings.json
index e7a55c55f1f..ec4f7b41a2e 100644
--- a/homeassistant/components/vilfo/strings.json
+++ b/homeassistant/components/vilfo/strings.json
@@ -1,6 +1,6 @@
 {
+  "title": "Vilfo Router",
   "config": {
-    "title": "Vilfo Router",
     "step": {
       "user": {
         "title": "Connect to the Vilfo Router",
diff --git a/homeassistant/components/vizio/strings.json b/homeassistant/components/vizio/strings.json
index 6f9c844d5cc..a3773d83950 100644
--- a/homeassistant/components/vizio/strings.json
+++ b/homeassistant/components/vizio/strings.json
@@ -1,6 +1,6 @@
 {
+  "title": "VIZIO SmartCast",
   "config": {
-    "title": "VIZIO SmartCast",
     "step": {
       "user": {
         "title": "Setup VIZIO SmartCast Device",
@@ -40,7 +40,6 @@
     }
   },
   "options": {
-    "title": "Update VIZIO SmartCast Options",
     "step": {
       "init": {
         "title": "Update VIZIO SmartCast Options",
diff --git a/homeassistant/components/wemo/strings.json b/homeassistant/components/wemo/strings.json
index d4b40817cb3..84ffc939937 100644
--- a/homeassistant/components/wemo/strings.json
+++ b/homeassistant/components/wemo/strings.json
@@ -1,6 +1,6 @@
 {
+  "title": "Wemo",
   "config": {
-    "title": "Wemo",
     "step": {
       "confirm": {
         "title": "Wemo",
diff --git a/homeassistant/components/withings/strings.json b/homeassistant/components/withings/strings.json
index 9f40c4babd9..908a122daa2 100644
--- a/homeassistant/components/withings/strings.json
+++ b/homeassistant/components/withings/strings.json
@@ -1,6 +1,6 @@
 {
+  "title": "Withings",
   "config": {
-    "title": "Withings",
     "step": {
       "profile": {
         "title": "User Profile.",
diff --git a/homeassistant/components/wled/strings.json b/homeassistant/components/wled/strings.json
index dde66b8e122..1f69203992a 100644
--- a/homeassistant/components/wled/strings.json
+++ b/homeassistant/components/wled/strings.json
@@ -1,6 +1,6 @@
 {
+  "title": "WLED",
   "config": {
-    "title": "WLED",
     "flow_title": "WLED: {name}",
     "step": {
       "user": {
diff --git a/homeassistant/components/wwlln/strings.json b/homeassistant/components/wwlln/strings.json
index 0ab731eaf50..f02c5cebdcb 100644
--- a/homeassistant/components/wwlln/strings.json
+++ b/homeassistant/components/wwlln/strings.json
@@ -1,6 +1,6 @@
 {
+  "title": "World Wide Lightning Location Network (WWLLN)",
   "config": {
-    "title": "World Wide Lightning Location Network (WWLLN)",
     "step": {
       "user": {
         "title": "Fill in your location information.",
diff --git a/homeassistant/components/zha/strings.json b/homeassistant/components/zha/strings.json
index a015ca30770..99d21c2886a 100644
--- a/homeassistant/components/zha/strings.json
+++ b/homeassistant/components/zha/strings.json
@@ -1,6 +1,6 @@
 {
+  "title": "ZHA",
   "config": {
-    "title": "ZHA",
     "step": {
       "user": {
         "title": "ZHA",
diff --git a/homeassistant/components/zwave/strings.json b/homeassistant/components/zwave/strings.json
index ddb03a135b9..393d7f6b7db 100644
--- a/homeassistant/components/zwave/strings.json
+++ b/homeassistant/components/zwave/strings.json
@@ -1,6 +1,6 @@
 {
+  "title": "Z-Wave",
   "config": {
-    "title": "Z-Wave",
     "step": {
       "user": {
         "title": "Set up Z-Wave",
diff --git a/script/scaffold/generate.py b/script/scaffold/generate.py
index b2f669006a9..8c3b2e9aeb8 100644
--- a/script/scaffold/generate.py
+++ b/script/scaffold/generate.py
@@ -113,8 +113,8 @@ def _custom_tasks(template, info) -> None:
     elif template == "config_flow":
         info.update_manifest(config_flow=True)
         info.update_strings(
+            title=info.name,
             config={
-                "title": info.name,
                 "step": {
                     "user": {"title": "Connect to the device", "data": {"host": "Host"}}
                 },
@@ -124,14 +124,14 @@ def _custom_tasks(template, info) -> None:
                     "unknown": "Unexpected error",
                 },
                 "abort": {"already_configured": "Device is already configured"},
-            }
+            },
         )
 
     elif template == "config_flow_discovery":
         info.update_manifest(config_flow=True)
         info.update_strings(
+            title=info.name,
             config={
-                "title": info.name,
                 "step": {
                     "confirm": {
                         "title": info.name,
@@ -142,14 +142,14 @@ def _custom_tasks(template, info) -> None:
                     "single_instance_allowed": f"Only a single configuration of {info.name} is possible.",
                     "no_devices_found": f"No {info.name} devices found on the network.",
                 },
-            }
+            },
         )
 
     elif template == "config_flow_oauth2":
         info.update_manifest(config_flow=True)
         info.update_strings(
+            title=info.name,
             config={
-                "title": info.name,
                 "step": {
                     "pick_implementation": {"title": "Pick Authentication Method"}
                 },
@@ -159,7 +159,7 @@ def _custom_tasks(template, info) -> None:
                 "create_entry": {
                     "default": f"Successfully authenticated with {info.name}."
                 },
-            }
+            },
         )
         _append(
             info.integration_dir / "const.py",