From 0b0425253728d723112947e428b42f9df40d208b Mon Sep 17 00:00:00 2001
From: Franck Nijhof <git@frenck.dev>
Date: Tue, 15 Mar 2022 21:36:33 +0100
Subject: [PATCH] Move /lovelace -> /dashboards, and renames resulting from
 that (#22036)

---
 _config.yml                                   |   2 +-
 package.json                                  |   2 +-
 .../alarm-panel.markdown                      |   4 +--
 .../{_lovelace => _dashboards}/area.markdown  |   2 +-
 .../button.markdown                           |  14 ++++----
 .../calendar.markdown                         |   3 +-
 .../conditional.markdown                      |   0
 .../energy.markdown                           |  20 +++++------
 .../entities.markdown                         |  28 +++++++--------
 .../entity-filter.markdown                    |   8 ++---
 .../entity.markdown                           |   4 +--
 .../{_lovelace => _dashboards}/gauge.markdown |   6 ++--
 .../glance.markdown                           |  12 +++----
 .../{_lovelace => _dashboards}/grid.markdown  |   2 +-
 .../history-graph.markdown                    |   4 +--
 .../horizontal-stack.markdown                 |   2 +-
 .../humidifier.markdown                       |   2 +-
 .../iframe.markdown                           |   2 +-
 .../{_lovelace => _dashboards}/light.markdown |   8 ++---
 .../logbook.markdown                          |   2 +-
 .../{_lovelace => _dashboards}/map.markdown   |   2 +-
 .../markdown.markdown                         |   4 +--
 .../masonry.markdown                          |   0
 .../media-control.markdown                    |   2 +-
 .../{_lovelace => _dashboards}/panel.markdown |   0
 .../picture-elements.markdown                 |  34 +++++++++---------
 .../picture-entity.markdown                   |   8 ++---
 .../picture-glance.markdown                   |  14 ++++----
 .../picture.markdown                          |  10 +++---
 .../plant-status.markdown                     |   2 +-
 .../sensor.markdown                           |   2 +-
 .../shopping-list.markdown                    |   2 +-
 .../sidebar.markdown                          |   0
 .../statistics-graph.markdown                 |   4 +--
 .../thermostat.markdown                       |   2 +-
 .../vertical-stack.markdown                   |   4 +--
 .../weather-forecast.markdown                 |   8 ++---
 source/_data/glossary.yml                     |   2 +-
 source/_docs/scripts/service-calls.markdown   |   2 +-
 ...gation.html => dashboards_navigation.html} |  18 +++++-----
 source/_includes/asides/docs_navigation.html  |   2 +-
 source/_includes/site/header.html             |   2 +-
 source/_includes/site/sidebar.html            |   4 +--
 source/_integrations/almond.markdown          |   2 +-
 source/_integrations/binary_sensor.markdown   |   2 +-
 source/_integrations/cast.markdown            |   2 +-
 source/_integrations/delijn.markdown          |   4 +--
 source/_integrations/filter.markdown          |   2 +-
 source/_integrations/fireservicerota.markdown |   2 +-
 source/_integrations/history_stats.markdown   |   2 +-
 source/_integrations/map.markdown             |   2 +-
 source/_integrations/meteo_france.markdown    |   2 +-
 source/_integrations/motioneye.markdown       |   4 +--
 source/_integrations/nest.markdown            |   2 +-
 source/_integrations/panel_iframe.markdown    |   2 +-
 source/_integrations/seventeentrack.markdown  |   2 +-
 source/_integrations/shopping_list.markdown   |   2 +-
 source/_integrations/system_health.markdown   |   2 +-
 source/_integrations/transmission.markdown    |   2 +-
 .../usgs_earthquakes_feed.markdown            |   2 +-
 .../_integrations/waze_travel_time.markdown   |   2 +-
 source/_integrations/xbox.markdown            |   6 ++--
 source/_integrations/xiaomi_miio.markdown     |   2 +-
 .../_integrations/yandex_transport.markdown   |   2 +-
 source/_posts/2018-07-06-release-73.markdown  |   2 +-
 source/_posts/2018-07-21-release-74.markdown  |   2 +-
 source/_posts/2018-10-12-release-80.markdown  |   4 +--
 source/_posts/2018-10-29-release-81.markdown  |   2 +-
 source/_posts/2018-12-12-release-84.markdown  |   4 +--
 .../2019-01-23-lovelace-released.markdown     |   6 ++--
 source/_posts/2019-08-07-release-97.markdown  |   2 +-
 source/_posts/2020-02-05-release-105.markdown |   2 +-
 source/_posts/2020-03-18-release-107.markdown |   8 ++---
 source/_posts/2020-05-20-release-110.markdown |   2 +-
 ...20-08-05-mobile-apps-new-features.markdown |   2 +-
 ...-04-09-android-april-2021-release.markdown |   2 +-
 ...2021-08-04-home-energy-management.markdown |   4 +--
 .../_posts/2021-08-04-release-20218.markdown  |   4 +--
 .../_posts/2022-03-02-release-20223.markdown  |   2 +-
 source/_redirects                             |  15 ++++----
 .../{lovelace => dashboards}/actions.markdown |  16 ++++-----
 .../{lovelace => dashboards}/badges.markdown  |   2 +-
 .../{lovelace => dashboards}/cards.markdown   |   0
 .../dashboards.markdown                       |   8 ++---
 .../header-footer.markdown                    |  12 +++----
 .../{lovelace => dashboards}/index.markdown   |   6 ++--
 .../{lovelace => dashboards}/views.markdown   |   4 +--
 source/docs/index.markdown                    |   4 +--
 .../energy/carbon-consumed-gauge.png          | Bin
 .../energy/date-selection.png                 | Bin
 .../energy/devices-graph.png                  | Bin
 .../energy/distribution.png                   | Bin
 .../energy/gas-graph.png                      | Bin
 .../energy/grid-neutrality-gauge.png          | Bin
 .../energy/solar-consumed-gauge.png           | Bin
 .../energy/solar-graph.png                    | Bin
 .../energy/sources-table.png                  | Bin
 .../energy/usage-graph.png                    | Bin
 .../header-footer/balloons-header.png         | Bin
 .../header-footer/graph.png                   | Bin
 .../screenshot-picture-buttons.png            | Bin
 .../lovelace-ui-comparison.png                | Bin
 .../lovelace_alarm_panel_card.gif             | Bin
 .../lovelace_alarm_panel_title_card.gif       | Bin
 .../lovelace_calendar_card.png                | Bin
 .../lovelace_entity_button_card.png           | Bin
 .../lovelace_entity_button_complex_card.png   | Bin
 .../lovelace_entity_card.png                  | Bin
 .../lovelace_entity_filter.png                | Bin
 .../lovelace_entity_filter_glance.png         | Bin
 .../lovelace_entity_row_buttons.jpg           | Bin
 .../lovelace_entity_row_special.jpg           | Bin
 .../lovelace_gauge_card.gif                   | Bin
 .../lovelace_gauge_needle_card.png            | Bin
 .../lovelace_glance_card.png                  | Bin
 .../lovelace_grid.png                         | Bin
 .../lovelace_history_graph.png                | Bin
 .../lovelace_history_graph_lines.png          | Bin
 .../lovelace_horizontal_stack.PNG             | Bin
 .../lovelace_humidifier_card.png              | Bin
 .../lovelace_iframe.png                       | Bin
 .../lovelace_light_card.png                   | Bin
 .../lovelace_light_complex_card.png           | Bin
 .../lovelace_logbook.png                      | Bin
 .../lovelace_map_card.png                     | Bin
 .../lovelace_markdown.png                     | Bin
 .../lovelace_mediaplayer.png                  | Bin
 .../lovelace_picture.png                      | Bin
 .../lovelace_picture_elements.gif             | Bin
 .../lovelace_picture_entity.gif               | Bin
 .../lovelace_picture_glance.gif               | Bin
 .../lovelace_plant_card.png                   | Bin
 .../lovelace_sensor.png                       | Bin
 .../lovelace_shopping_list_card.gif           | Bin
 .../lovelace_statistics_graph_bar.png         | Bin
 .../lovelace_statistics_graph_line.png        | Bin
 .../lovelace_thermostat_card.gif              | Bin
 .../lovelace_vertical-horizontal-stack.png    | Bin
 .../lovelace_vertical-stack.png               | Bin
 .../lovelace_views.png                        | Bin
 .../lovelace_weather.png                      | Bin
 source/installation/index.html                |   2 +-
 142 files changed, 213 insertions(+), 209 deletions(-)
 rename source/{_lovelace => _dashboards}/alarm-panel.markdown (90%)
 rename source/{_lovelace => _dashboards}/area.markdown (97%)
 rename source/{_lovelace => _dashboards}/button.markdown (87%)
 rename source/{_lovelace => _dashboards}/calendar.markdown (95%)
 rename source/{_lovelace => _dashboards}/conditional.markdown (100%)
 rename source/{_lovelace => _dashboards}/energy.markdown (77%)
 rename source/{_lovelace => _dashboards}/entities.markdown (93%)
 rename source/{_lovelace => _dashboards}/entity-filter.markdown (91%)
 rename source/{_lovelace => _dashboards}/entity.markdown (93%)
 rename source/{_lovelace => _dashboards}/gauge.markdown (88%)
 rename source/{_lovelace => _dashboards}/glance.markdown (90%)
 rename source/{_lovelace => _dashboards}/grid.markdown (95%)
 rename source/{_lovelace => _dashboards}/history-graph.markdown (88%)
 rename source/{_lovelace => _dashboards}/horizontal-stack.markdown (91%)
 rename source/{_lovelace => _dashboards}/humidifier.markdown (92%)
 rename source/{_lovelace => _dashboards}/iframe.markdown (94%)
 rename source/{_lovelace => _dashboards}/light.markdown (85%)
 rename source/{_lovelace => _dashboards}/logbook.markdown (95%)
 rename source/{_lovelace => _dashboards}/map.markdown (96%)
 rename source/{_lovelace => _dashboards}/markdown.markdown (96%)
 rename source/{_lovelace => _dashboards}/masonry.markdown (100%)
 rename source/{_lovelace => _dashboards}/media-control.markdown (92%)
 rename source/{_lovelace => _dashboards}/panel.markdown (100%)
 rename source/{_lovelace => _dashboards}/picture-elements.markdown (94%)
 rename source/{_lovelace => _dashboards}/picture-entity.markdown (93%)
 rename source/{_lovelace => _dashboards}/picture-glance.markdown (93%)
 rename source/{_lovelace => _dashboards}/picture.markdown (86%)
 rename source/{_lovelace => _dashboards}/plant-status.markdown (92%)
 rename source/{_lovelace => _dashboards}/sensor.markdown (96%)
 rename source/{_lovelace => _dashboards}/shopping-list.markdown (92%)
 rename source/{_lovelace => _dashboards}/sidebar.markdown (100%)
 rename source/{_lovelace => _dashboards}/statistics-graph.markdown (90%)
 rename source/{_lovelace => _dashboards}/thermostat.markdown (93%)
 rename source/{_lovelace => _dashboards}/vertical-stack.markdown (87%)
 rename source/{_lovelace => _dashboards}/weather-forecast.markdown (93%)
 rename source/_includes/asides/{lovelace_navigation.html => dashboards_navigation.html} (69%)
 rename source/{lovelace => dashboards}/actions.markdown (95%)
 rename source/{lovelace => dashboards}/badges.markdown (98%)
 rename source/{lovelace => dashboards}/cards.markdown (100%)
 rename source/{lovelace => dashboards}/dashboards.markdown (97%)
 rename source/{lovelace => dashboards}/header-footer.markdown (84%)
 rename source/{lovelace => dashboards}/index.markdown (87%)
 rename source/{lovelace => dashboards}/views.markdown (97%)
 rename source/images/{lovelace => dashboards}/energy/carbon-consumed-gauge.png (100%)
 rename source/images/{lovelace => dashboards}/energy/date-selection.png (100%)
 rename source/images/{lovelace => dashboards}/energy/devices-graph.png (100%)
 rename source/images/{lovelace => dashboards}/energy/distribution.png (100%)
 rename source/images/{lovelace => dashboards}/energy/gas-graph.png (100%)
 rename source/images/{lovelace => dashboards}/energy/grid-neutrality-gauge.png (100%)
 rename source/images/{lovelace => dashboards}/energy/solar-consumed-gauge.png (100%)
 rename source/images/{lovelace => dashboards}/energy/solar-graph.png (100%)
 rename source/images/{lovelace => dashboards}/energy/sources-table.png (100%)
 rename source/images/{lovelace => dashboards}/energy/usage-graph.png (100%)
 rename source/images/{lovelace => dashboards}/header-footer/balloons-header.png (100%)
 rename source/images/{lovelace => dashboards}/header-footer/graph.png (100%)
 rename source/images/{lovelace => dashboards}/header-footer/screenshot-picture-buttons.png (100%)
 rename source/images/{lovelace => dashboards}/lovelace-ui-comparison.png (100%)
 rename source/images/{lovelace => dashboards}/lovelace_alarm_panel_card.gif (100%)
 rename source/images/{lovelace => dashboards}/lovelace_alarm_panel_title_card.gif (100%)
 rename source/images/{lovelace => dashboards}/lovelace_calendar_card.png (100%)
 rename source/images/{lovelace => dashboards}/lovelace_entity_button_card.png (100%)
 rename source/images/{lovelace => dashboards}/lovelace_entity_button_complex_card.png (100%)
 rename source/images/{lovelace => dashboards}/lovelace_entity_card.png (100%)
 rename source/images/{lovelace => dashboards}/lovelace_entity_filter.png (100%)
 rename source/images/{lovelace => dashboards}/lovelace_entity_filter_glance.png (100%)
 rename source/images/{lovelace => dashboards}/lovelace_entity_row_buttons.jpg (100%)
 rename source/images/{lovelace => dashboards}/lovelace_entity_row_special.jpg (100%)
 rename source/images/{lovelace => dashboards}/lovelace_gauge_card.gif (100%)
 rename source/images/{lovelace => dashboards}/lovelace_gauge_needle_card.png (100%)
 rename source/images/{lovelace => dashboards}/lovelace_glance_card.png (100%)
 rename source/images/{lovelace => dashboards}/lovelace_grid.png (100%)
 rename source/images/{lovelace => dashboards}/lovelace_history_graph.png (100%)
 rename source/images/{lovelace => dashboards}/lovelace_history_graph_lines.png (100%)
 rename source/images/{lovelace => dashboards}/lovelace_horizontal_stack.PNG (100%)
 rename source/images/{lovelace => dashboards}/lovelace_humidifier_card.png (100%)
 rename source/images/{lovelace => dashboards}/lovelace_iframe.png (100%)
 rename source/images/{lovelace => dashboards}/lovelace_light_card.png (100%)
 rename source/images/{lovelace => dashboards}/lovelace_light_complex_card.png (100%)
 rename source/images/{lovelace => dashboards}/lovelace_logbook.png (100%)
 rename source/images/{lovelace => dashboards}/lovelace_map_card.png (100%)
 rename source/images/{lovelace => dashboards}/lovelace_markdown.png (100%)
 rename source/images/{lovelace => dashboards}/lovelace_mediaplayer.png (100%)
 rename source/images/{lovelace => dashboards}/lovelace_picture.png (100%)
 rename source/images/{lovelace => dashboards}/lovelace_picture_elements.gif (100%)
 rename source/images/{lovelace => dashboards}/lovelace_picture_entity.gif (100%)
 rename source/images/{lovelace => dashboards}/lovelace_picture_glance.gif (100%)
 rename source/images/{lovelace => dashboards}/lovelace_plant_card.png (100%)
 rename source/images/{lovelace => dashboards}/lovelace_sensor.png (100%)
 rename source/images/{lovelace => dashboards}/lovelace_shopping_list_card.gif (100%)
 rename source/images/{lovelace => dashboards}/lovelace_statistics_graph_bar.png (100%)
 rename source/images/{lovelace => dashboards}/lovelace_statistics_graph_line.png (100%)
 rename source/images/{lovelace => dashboards}/lovelace_thermostat_card.gif (100%)
 rename source/images/{lovelace => dashboards}/lovelace_vertical-horizontal-stack.png (100%)
 rename source/images/{lovelace => dashboards}/lovelace_vertical-stack.png (100%)
 rename source/images/{lovelace => dashboards}/lovelace_views.png (100%)
 rename source/images/{lovelace => dashboards}/lovelace_weather.png (100%)

diff --git a/_config.yml b/_config.yml
index fd1a87fccc8..d39d12ccbe3 100644
--- a/_config.yml
+++ b/_config.yml
@@ -75,7 +75,7 @@ collections:
     output: true
   faq:
     output: true
-  lovelace:
+  dashboards:
     output: true
 
 # ----------------------- #
diff --git a/package.json b/package.json
index 080bff19db9..45d1be6a0c4 100644
--- a/package.json
+++ b/package.json
@@ -20,6 +20,6 @@
   "scripts": {
     "markdown:lint": "remark --quiet --frail .",
     "textlint:all": "textlint source",
-    "textlint": "textlint source/_examples source/_docs source/_faq source/_integrations source/_lovelace source/cloud source/getting-started source/hassio source/lovelace"
+    "textlint": "textlint source/_examples source/_docs source/_faq source/_integrations source/_dashboards source/cloud source/getting-started source/hassio source/dashboards"
   }
 }
diff --git a/source/_lovelace/alarm-panel.markdown b/source/_dashboards/alarm-panel.markdown
similarity index 90%
rename from source/_lovelace/alarm-panel.markdown
rename to source/_dashboards/alarm-panel.markdown
index 6f4679798c4..477305012c7 100644
--- a/source/_lovelace/alarm-panel.markdown
+++ b/source/_dashboards/alarm-panel.markdown
@@ -8,7 +8,7 @@ description: "The Alarm Panel card allows you to arm and disarm your alarm contr
 The Alarm Panel card allows you to arm and disarm your [alarm control panel](/integrations/#alarm) integrations.
 
 <p class='img'>
-<img src='/images/lovelace/lovelace_alarm_panel_card.gif' alt='Screenshot of the alarm panel card'>
+<img src='/images/dashboards/lovelace_alarm_panel_card.gif' alt='Screenshot of the alarm panel card'>
 Screenshot of the Alarm Panel card.
 </p>
 
@@ -66,7 +66,7 @@ Title example:
 ```
 
 <p class='img'>
-<img src='/images/lovelace/lovelace_alarm_panel_title_card.gif' alt='Screenshot of the alarm panel card'>
+<img src='/images/dashboards/lovelace_alarm_panel_title_card.gif' alt='Screenshot of the alarm panel card'>
 Screenshot of the Alarm Panel card.
 </p>
 
diff --git a/source/_lovelace/area.markdown b/source/_dashboards/area.markdown
similarity index 97%
rename from source/_lovelace/area.markdown
rename to source/_dashboards/area.markdown
index 9e4cd983da3..0756ce38904 100644
--- a/source/_lovelace/area.markdown
+++ b/source/_dashboards/area.markdown
@@ -35,7 +35,7 @@ show_camera:
   default: false
 navigation_path:
   required: false
-  description: link to view. For more information about views, see the [view documentation](/lovelace/views/)
+  description: link to view. For more information about views, see the [view documentation](/dashboards/views/)
   type: string
 theme:
   required: false
diff --git a/source/_lovelace/button.markdown b/source/_dashboards/button.markdown
similarity index 87%
rename from source/_lovelace/button.markdown
rename to source/_dashboards/button.markdown
index 388e507de2d..9a1f9bd9a18 100644
--- a/source/_lovelace/button.markdown
+++ b/source/_dashboards/button.markdown
@@ -8,7 +8,7 @@ description: "The Button card allows you to add buttons to perform tasks."
 The Button card allows you to add buttons to perform tasks.
 
 <p class='img'>
-<img src='/images/lovelace/lovelace_entity_button_card.png' alt='Screenshot of three Button Cards'>
+<img src='/images/dashboards/lovelace_entity_button_card.png' alt='Screenshot of three Button Cards'>
 Screenshot of three Button Cards.
 </p>
 
@@ -32,9 +32,9 @@ Icon Height:
 Theme:
   description: Name of any loaded theme to be used for this card. For more information about themes, see the [frontend documentation](/integrations/frontend/).
 Tap Action:
-  description: The action taken on card tap. For more information, see the [action documentation](/lovelace/actions/#tap-action).
+  description: The action taken on card tap. For more information, see the [action documentation](/dashboards/actions/#tap-action).
 Hold Action:
-  description: The action taken on card tap and hold. For more information, see the [action documentation](/lovelace/actions/#hold-action).
+  description: The action taken on card tap and hold. For more information, see the [action documentation](/dashboards/actions/#hold-action).
 {% endconfiguration_basic %}
 
 ### YAML
@@ -87,15 +87,15 @@ state_color:
   default: true
 tap_action:
   required: false
-  description: The action taken on card tap. For more information, see the [action documentation](/lovelace/actions/#tap-action).
+  description: The action taken on card tap. For more information, see the [action documentation](/dashboards/actions/#tap-action).
   type: map
 hold_action:
   required: false
-  description: The action taken on card tap and hold. For more information, see the [action documentation](/lovelace/actions/#hold-action).
+  description: The action taken on card tap and hold. For more information, see the [action documentation](/dashboards/actions/#hold-action).
   type: map
 double_tap_action:
   required: false
-  description: The action taken on card double-tap. For more information, see the [action documentation](/lovelace/actions/#double-tap-action).
+  description: The action taken on card double-tap. For more information, see the [action documentation](/dashboards/actions/#double-tap-action).
   type: map
 theme:
   required: false
@@ -135,6 +135,6 @@ tap_action:
 ```
 
 <p class='img'>
-<img src='/images/lovelace/lovelace_entity_button_complex_card.png' alt='Screenshot of the Button card with Script Service'>
+<img src='/images/dashboards/lovelace_entity_button_complex_card.png' alt='Screenshot of the Button card with Script Service'>
 Screenshot of the Button card with Script Service.
 </p>
diff --git a/source/_lovelace/calendar.markdown b/source/_dashboards/calendar.markdown
similarity index 95%
rename from source/_lovelace/calendar.markdown
rename to source/_dashboards/calendar.markdown
index 560dbb8c5b9..71e80204fdd 100644
--- a/source/_lovelace/calendar.markdown
+++ b/source/_dashboards/calendar.markdown
@@ -8,7 +8,8 @@ description: "The calendar card displays your calendar entities in a month, day
 The Calendar card displays your [calendar](/integrations/#calendar) entities in a month, day and list view.
 
 <p class='img'>
-  <img src='/images/lovelace/lovelace_calendar_card.png' alt='Screenshot of the calendar card'>
+  <img src='/images/dashboards/lovelace_calendar_card.png' alt='Screenshot of the 
+  calendar card'>
   Screenshot of the Calendar card.
 </p>
 
diff --git a/source/_lovelace/conditional.markdown b/source/_dashboards/conditional.markdown
similarity index 100%
rename from source/_lovelace/conditional.markdown
rename to source/_dashboards/conditional.markdown
diff --git a/source/_lovelace/energy.markdown b/source/_dashboards/energy.markdown
similarity index 77%
rename from source/_lovelace/energy.markdown
rename to source/_dashboards/energy.markdown
index 63868e23532..0b4dc4ac0b6 100644
--- a/source/_lovelace/energy.markdown
+++ b/source/_dashboards/energy.markdown
@@ -12,7 +12,7 @@ At the moment there are no configuration options available for these cards, you
 ## Energy date picker
 
 <p class='img'>
-  <img src='/images/lovelace/energy/date-selection.png' alt='Screenshot of the energy date selection card'>
+  <img src='/images/dashboards/energy/date-selection.png' alt='Screenshot of the energy date selection card'>
   Screenshot of the Energy date selection card.
 </p>
 
@@ -26,7 +26,7 @@ type: energy-date-selection
 ## Energy usage graph
 
 <p class='img'>
-  <img src='/images/lovelace/energy/usage-graph.png' alt='Screenshot of the energy usage graph card'>
+  <img src='/images/dashboards/energy/usage-graph.png' alt='Screenshot of the energy usage graph card'>
   Screenshot of the Energy usage graph card.
 </p>
 
@@ -41,7 +41,7 @@ type: energy-usage-graph
 ## Solar production graph
 
 <p class='img'>
-  <img src='/images/lovelace/energy/solar-graph.png' alt='Screenshot of the solar graph card'>
+  <img src='/images/dashboards/energy/solar-graph.png' alt='Screenshot of the solar graph card'>
   Screenshot of the Solar production graph card.
 </p>
 
@@ -55,7 +55,7 @@ type: energy-solar-graph
 ## Gas consumption graph
 
 <p class='img'>
-  <img src='/images/lovelace/energy/gas-graph.png' alt='Screenshot of the gas consumption graph card'>
+  <img src='/images/dashboards/energy/gas-graph.png' alt='Screenshot of the gas consumption graph card'>
   Screenshot of the gas consumption graph card.
 </p>
 
@@ -70,7 +70,7 @@ type: energy-gas-graph
 ## Energy distribution
 
 <p class='img'>
-  <img src='/images/lovelace/energy/distribution.png' alt='Screenshot of the energy distribution card'>
+  <img src='/images/dashboards/energy/distribution.png' alt='Screenshot of the energy distribution card'>
   Screenshot of the Energy distribution card.
 </p>
 
@@ -89,7 +89,7 @@ link_dashboard: true
 ## Energy sources table
 
 <p class='img'>
-  <img src='/images/lovelace/energy/sources-table.png' alt='Screenshot of the energy sources table card'>
+  <img src='/images/dashboards/energy/sources-table.png' alt='Screenshot of the energy sources table card'>
   Screenshot of the Energy sources table card.
 </p>
 
@@ -104,7 +104,7 @@ type: energy-sources-table
 ## Grid neutrality gauge
 
 <p class='img'>
-  <img src='/images/lovelace/energy/grid-neutrality-gauge.png' alt='Screenshot of the grid neutrality gauge card'>
+  <img src='/images/dashboards/energy/grid-neutrality-gauge.png' alt='Screenshot of the grid neutrality gauge card'>
   Screenshot of the Grid neutrality gauge card.
 </p>
 
@@ -118,7 +118,7 @@ type: energy-grid-neutrality-gauge
 ## Solar consumed gauge
 
 <p class='img'>
-  <img src='/images/lovelace/energy/solar-consumed-gauge.png' alt='Screenshot of the solar consumed gauge card'>
+  <img src='/images/dashboards/energy/solar-consumed-gauge.png' alt='Screenshot of the solar consumed gauge card'>
   Screenshot of the Solar consumed gauge card.
 </p>
 
@@ -132,7 +132,7 @@ type: energy-solar-consumed-gauge
 ## Carbon consumed gauge
 
 <p class='img'>
-  <img src='/images/lovelace/energy/carbon-consumed-gauge.png' alt='Screenshot of the carbon consumed gauge card'>
+  <img src='/images/dashboards/energy/carbon-consumed-gauge.png' alt='Screenshot of the carbon consumed gauge card'>
   Screenshot of the Carbon consumed gauge card.
 </p>
 
@@ -146,7 +146,7 @@ type: energy-carbon-consumed-gauge
 ## Devices energy graph
 
 <p class='img'>
-  <img src='/images/lovelace/energy/devices-graph.png' alt='Screenshot of the devices energy graph card'>
+  <img src='/images/dashboards/energy/devices-graph.png' alt='Screenshot of the devices energy graph card'>
   Screenshot of the devices energy graph card.
 </p>
 
diff --git a/source/_lovelace/entities.markdown b/source/_dashboards/entities.markdown
similarity index 93%
rename from source/_lovelace/entities.markdown
rename to source/_dashboards/entities.markdown
index 822d95529e6..d24e7eba0b5 100644
--- a/source/_lovelace/entities.markdown
+++ b/source/_dashboards/entities.markdown
@@ -42,11 +42,11 @@ state_color:
   default: false
 header:
   required: false
-  description: Header widget to render. See [header documentation](/lovelace/header-footer/).
+  description: Header widget to render. See [header documentation](/dashboards/header-footer/).
   type: map
 footer:
   required: false
-  description: Footer widget to render. See [footer documentation](/lovelace/header-footer/).
+  description: Footer widget to render. See [footer documentation](/dashboards/header-footer/).
   type: map
 {% endconfiguration %}
 
@@ -94,15 +94,15 @@ state_color:
   default: false
 tap_action:
   required: false
-  description: Action taken on row tap. See [action documentation](/lovelace/actions/#tap-action).
+  description: Action taken on row tap. See [action documentation](/dashboards/actions/#tap-action).
   type: map
 hold_action:
   required: false
-  description: Action taken on row tap and hold. See [action documentation](/lovelace/actions/#hold-action).
+  description: Action taken on row tap and hold. See [action documentation](/dashboards/actions/#hold-action).
   type: map
 double_tap_action:
   required: false
-  description: Action taken on row double tap. See [action documentation](/lovelace/actions/#double-tap-action).
+  description: Action taken on row double tap. See [action documentation](/dashboards/actions/#double-tap-action).
   type: map
 {% endconfiguration %}
 
@@ -176,15 +176,15 @@ action_name:
   default: "`Run`"
 tap_action:
   required: true
-  description: Action taken on button tap. See [action documentation](/lovelace/actions/#tap-action).
+  description: Action taken on button tap. See [action documentation](/dashboards/actions/#tap-action).
   type: map
 hold_action:
   required: false
-  description: Action taken on button tap and hold. See [action documentation](/lovelace/actions/#hold-action).
+  description: Action taken on button tap and hold. See [action documentation](/dashboards/actions/#hold-action).
   type: map
 double_tap_action:
   required: false
-  description: Action taken on button double tap. See [action documentation](/lovelace/actions/#double-tap-action).
+  description: Action taken on button double tap. See [action documentation](/dashboards/actions/#double-tap-action).
   type: map
 {% endconfiguration %}
 
@@ -231,15 +231,15 @@ entities:
       default: "true"
     tap_action:
       required: false
-      description: Action taken on button tap. See [action documentation](/lovelace/actions/#tap-action).
+      description: Action taken on button tap. See [action documentation](/dashboards/actions/#tap-action).
       type: map
     hold_action:
       required: false
-      description: Action taken on button tap and hold. See [action documentation](/lovelace/actions/#hold-action).
+      description: Action taken on button tap and hold. See [action documentation](/dashboards/actions/#hold-action).
       type: map
     double_tap_action:
       required: false
-      description: Action taken on button double tap. See [action documentation](/lovelace/actions/#double-tap-action).
+      description: Action taken on button double tap. See [action documentation](/dashboards/actions/#double-tap-action).
       type: map
 {% endconfiguration %}
 
@@ -382,7 +382,7 @@ type: entities
 title: Entities card sample
 show_header_toggle: true
 header:
-  image: "https://www.home-assistant.io/images/lovelace/header-footer/balloons-header.png"
+  image: "https://www.home-assistant.io/images/dashboards/header-footer/balloons-header.png"
   type: picture
 entities:
   - entity: alarm_control_panel.alarm
@@ -398,7 +398,7 @@ entities:
 Above the divider are regular entity rows, below one of type `buttons`. Note that regular entity rows automatically show the entity name, whereas for buttons you have to explicitly specify a label / name.
 
 <p class='img'>
-<img src='/images/lovelace/lovelace_entity_row_buttons.jpg' alt='Screenshot of buttons row'>
+<img src='/images/dashboards/lovelace_entity_row_buttons.jpg' alt='Screenshot of buttons row'>
 Screenshot of buttons row.
 </p>
 
@@ -419,7 +419,7 @@ entities:
 ### Other special rows
 
 <p class='img'>
-<img src='/images/lovelace/lovelace_entity_row_special.jpg' alt='Screenshot of other special rows'>
+<img src='/images/dashboards/lovelace_entity_row_special.jpg' alt='Screenshot of other special rows'>
 Screenshot of other special rows.
 </p>
 
diff --git a/source/_lovelace/entity-filter.markdown b/source/_dashboards/entity-filter.markdown
similarity index 91%
rename from source/_lovelace/entity-filter.markdown
rename to source/_dashboards/entity-filter.markdown
index 0e62325fe56..99c6e650d04 100644
--- a/source/_lovelace/entity-filter.markdown
+++ b/source/_dashboards/entity-filter.markdown
@@ -7,10 +7,10 @@ description: "The Entity Filter card allows you to define a list of entities tha
 
 The Entity Filter card allows you to define a list of entities that you want to track only when in a certain state. Very useful for showing lights that you forgot to turn off or show a list of people only when they're at home.
 
-This type of card can also be used together with rest of cards that allow multiple entities, allowing you to use [glance](/lovelace/glance/) or [picture-glance](/lovelace/picture-glance/). By default it uses [entities](/lovelace/entities/) card model.
+This type of card can also be used together with rest of cards that allow multiple entities, allowing you to use [glance](/dashboards/glance/) or [picture-glance](/dashboards/picture-glance/). By default it uses [entities](/dashboards/entities/) card model.
 
 <p class='img'>
-<img src='/images/lovelace/lovelace_entity_filter.png' alt='Screenshot of the Entity Filter card'>
+<img src='/images/dashboards/lovelace_entity_filter.png' alt='Screenshot of the Entity Filter card'>
 Screenshot of the Entity Filter card.
 </p>
 
@@ -108,7 +108,7 @@ state_filter:
   - "on"
 ```
 
-Show only people that are at home using [glance](/lovelace/glance/):
+Show only people that are at home using [glance](/dashboards/glance/):
 
 ```yaml
 type: entity-filter
@@ -124,7 +124,7 @@ card:
 ```
 
 <p class='img'>
-  <img src='/images/lovelace/lovelace_entity_filter_glance.png' alt='Entity filter combined with glance card'>
+  <img src='/images/dashboards/lovelace_entity_filter_glance.png' alt='Entity filter combined with glance card'>
   Entity filter combined with glance card.
 </p>
 
diff --git a/source/_lovelace/entity.markdown b/source/_dashboards/entity.markdown
similarity index 93%
rename from source/_lovelace/entity.markdown
rename to source/_dashboards/entity.markdown
index 1c9482059c9..bb4c11fd37c 100644
--- a/source/_lovelace/entity.markdown
+++ b/source/_dashboards/entity.markdown
@@ -8,7 +8,7 @@ description: "The Entity card gives you a quick overview of your entity's state"
 The Entity card gives you a quick overview of your entity's state.
 
 <p class='img'>
-  <img src='/images/lovelace/lovelace_entity_card.png' alt='Screenshot of the entity card'>
+  <img src='/images/dashboards/lovelace_entity_card.png' alt='Screenshot of the entity card'>
   Screenshot of the Entity card.
 </p>
 
@@ -52,7 +52,7 @@ theme:
   type: string
 footer:
   required: false
-  description: Footer widget to render. See [footer documentation](/lovelace/header-footer/).
+  description: Footer widget to render. See [footer documentation](/dashboards/header-footer/).
   type: map
 {% endconfiguration %}
 
diff --git a/source/_lovelace/gauge.markdown b/source/_dashboards/gauge.markdown
similarity index 88%
rename from source/_lovelace/gauge.markdown
rename to source/_dashboards/gauge.markdown
index 8565047cd1c..98664ce0d61 100644
--- a/source/_lovelace/gauge.markdown
+++ b/source/_dashboards/gauge.markdown
@@ -8,12 +8,12 @@ description: "The Gauge card is a basic card that allows visually seeing sensor
 The Gauge card is a basic card that allows visually seeing sensor data.
 
 <p class='img'>
-<img src='/images/lovelace/lovelace_gauge_card.gif' alt='Screenshot of the Gauge card'>
+<img src='/images/dashboards/lovelace_gauge_card.gif' alt='Screenshot of the Gauge card'>
 Screenshot of the Gauge card.
 </p>
 
 <p class='img'>
-<img src='/images/lovelace/lovelace_gauge_needle_card.png' alt='Screenshot of the Gauge card in needle mode'>
+<img src='/images/dashboards/lovelace_gauge_needle_card.png' alt='Screenshot of the Gauge card in needle mode'>
 Screenshot of the Gauge card in needle mode.
 </p>
 
@@ -95,7 +95,7 @@ entity: sensor.cpu_usage
 ```
 
 <p class='img'>
-<img src='/images/lovelace/lovelace_gauge_card.gif' alt='Screenshot of the gauge card with custom title and unit of measurement'>
+<img src='/images/dashboards/lovelace_gauge_card.gif' alt='Screenshot of the gauge card with custom title and unit of measurement'>
 Screenshot of the gauge card with custom title and unit of measurement.
 </p>
 
diff --git a/source/_lovelace/glance.markdown b/source/_dashboards/glance.markdown
similarity index 90%
rename from source/_lovelace/glance.markdown
rename to source/_dashboards/glance.markdown
index 7c49b374dc4..e92ae5166af 100644
--- a/source/_lovelace/glance.markdown
+++ b/source/_dashboards/glance.markdown
@@ -5,10 +5,10 @@ sidebar_label: Glance
 description: "The Glance card is useful to group multiple sensors in a compact overview."
 ---
 
-The Glance card is useful to group multiple sensors in a compact overview. Keep in mind that this can be used together with [entity-filter](/lovelace/entity-filter/) cards to create dynamic cards.
+The Glance card is useful to group multiple sensors in a compact overview. Keep in mind that this can be used together with [entity-filter](/dashboards/entity-filter/) cards to create dynamic cards.
 
 <p class='img'>
-<img src='/images/lovelace/lovelace_glance_card.png' alt='Screenshot of the glance card'>
+<img src='/images/dashboards/lovelace_glance_card.png' alt='Screenshot of the glance card'>
 Screenshot of the Glance card.
 </p>
 
@@ -90,15 +90,15 @@ show_state:
   default: true
 tap_action:
   required: false
-  description: Action taken on card tap. See [action documentation](/lovelace/actions/#tap-action).
+  description: Action taken on card tap. See [action documentation](/dashboards/actions/#tap-action).
   type: map
 hold_action:
   required: false
-  description: Action taken on card tap and hold. See [action documentation](/lovelace/actions/).
+  description: Action taken on card tap and hold. See [action documentation](/dashboards/actions/).
   type: map
 double_tap_action:
   required: false
-  description: Action taken on card double tap. See [action documentation](/lovelace/actions/#double-tap-action).
+  description: Action taken on card double tap. See [action documentation](/dashboards/actions/#double-tap-action).
   type: map
 {% endconfiguration %}
 
@@ -129,7 +129,7 @@ entities:
 ```
 
 <p class='img'>
-<img src='/images/lovelace/lovelace_glance_card.png' alt='Screenshot of the glance card with custom title'>
+<img src='/images/dashboards/lovelace_glance_card.png' alt='Screenshot of the glance card with custom title'>
 Screenshot of the glance card with custom title.
 </p>
 
diff --git a/source/_lovelace/grid.markdown b/source/_dashboards/grid.markdown
similarity index 95%
rename from source/_lovelace/grid.markdown
rename to source/_dashboards/grid.markdown
index 52dcf4653b4..f55fe6057a2 100644
--- a/source/_lovelace/grid.markdown
+++ b/source/_dashboards/grid.markdown
@@ -8,7 +8,7 @@ description: "The Grid card allows you to show multiple cards in a grid."
 The Grid card allows you to show multiple cards in a grid. It will first fill the columns, automatically adding new rows as needed.
 
 <p class='img'>
-  <img src='/images/lovelace/lovelace_grid.png' alt='Screenshot of the grid card'>
+  <img src='/images/dashboards/lovelace_grid.png' alt='Screenshot of the grid card'>
   Screenshot of the Grid card.
 </p>
 
diff --git a/source/_lovelace/history-graph.markdown b/source/_dashboards/history-graph.markdown
similarity index 88%
rename from source/_lovelace/history-graph.markdown
rename to source/_dashboards/history-graph.markdown
index 229303ce152..3b4f2ba94a3 100644
--- a/source/_lovelace/history-graph.markdown
+++ b/source/_dashboards/history-graph.markdown
@@ -8,12 +8,12 @@ description: "The History Graph card allows you to display a graph for each of t
 The History Graph card allows you to display a graph for each of the entities listed.
 
 <p class='img'>
-<img src='/images/lovelace/lovelace_history_graph.png' alt='Screenshot of the history graph card for entities without a unit_of_measurement'>
+<img src='/images/dashboards/lovelace_history_graph.png' alt='Screenshot of the history graph card for entities without a unit_of_measurement'>
 Screenshot of the History Graph card, when the sensor has no `unit_of_measurement` defined.
 </p>
 
 <p class='img'>
-<img src='/images/lovelace/lovelace_history_graph_lines.png' alt='Screenshot of the history graph card for entities with a unit_of_measurement'>
+<img src='/images/dashboards/lovelace_history_graph_lines.png' alt='Screenshot of the history graph card for entities with a unit_of_measurement'>
 Screenshot of the History Graph card, when the sensor has a `unit_of_measurement` defined.
 </p>
 
diff --git a/source/_lovelace/horizontal-stack.markdown b/source/_dashboards/horizontal-stack.markdown
similarity index 91%
rename from source/_lovelace/horizontal-stack.markdown
rename to source/_dashboards/horizontal-stack.markdown
index fa7811ad8f3..9f799b1efc9 100644
--- a/source/_lovelace/horizontal-stack.markdown
+++ b/source/_dashboards/horizontal-stack.markdown
@@ -39,6 +39,6 @@ cards:
 ```
 
 <p class='img'>
-  <img src='/images/lovelace/lovelace_horizontal_stack.PNG' alt='Two picture cards in a horizontal stack card'>
+  <img src='/images/dashboards/lovelace_horizontal_stack.PNG' alt='Two picture cards in a horizontal stack card'>
   Two Picture cards in a Horizontal Stack card.
 </p>
diff --git a/source/_lovelace/humidifier.markdown b/source/_dashboards/humidifier.markdown
similarity index 92%
rename from source/_lovelace/humidifier.markdown
rename to source/_dashboards/humidifier.markdown
index a61f8827abc..c1e126eb175 100644
--- a/source/_lovelace/humidifier.markdown
+++ b/source/_dashboards/humidifier.markdown
@@ -8,7 +8,7 @@ description: "The Humidifier card gives control of your humidifier entity, allow
 The Humidifier card lets you control and monitor humidifiers, dehumidifiers, and hygrostat devices.
 
 <p class='img'>
-  <img src='/images/lovelace/lovelace_humidifier_card.png' alt='Screenshot of the humidifier card'>
+  <img src='/images/dashboards/lovelace_humidifier_card.png' alt='Screenshot of the humidifier card'>
   Screenshot of the humidifier card.
 </p>
 
diff --git a/source/_lovelace/iframe.markdown b/source/_dashboards/iframe.markdown
similarity index 94%
rename from source/_lovelace/iframe.markdown
rename to source/_dashboards/iframe.markdown
index d92a7778322..05d5fd756bf 100644
--- a/source/_lovelace/iframe.markdown
+++ b/source/_dashboards/iframe.markdown
@@ -12,7 +12,7 @@ You can't embed sites using HTTP if you are using HTTPS for your Home Assistant.
 </div>
 
 <p class='img'>
-  <img width="500" src='/images/lovelace/lovelace_iframe.png' alt='Windy weather radar as Webpage'>
+  <img width="500" src='/images/dashboards/lovelace_iframe.png' alt='Windy weather radar as Webpage'>
   Windy weather radar as Webpage.
 </p>
 
diff --git a/source/_lovelace/light.markdown b/source/_dashboards/light.markdown
similarity index 85%
rename from source/_lovelace/light.markdown
rename to source/_dashboards/light.markdown
index 12453e7b536..429d7e52aea 100644
--- a/source/_lovelace/light.markdown
+++ b/source/_dashboards/light.markdown
@@ -8,7 +8,7 @@ description: "The Light card allows you to change the brightness of the light."
 The Light card allows you to change the brightness of the light.
 
 <p class='img'>
-<img src='/images/lovelace/lovelace_light_card.png' alt='Screenshot of the Light card'>
+<img src='/images/dashboards/lovelace_light_card.png' alt='Screenshot of the Light card'>
 Screenshot of the Light card.
 </p>
 
@@ -46,11 +46,11 @@ theme:
   type: string
 hold_action:
   required: false
-  description: Action taken on card tap and hold. See [action documentation](/lovelace/actions/#hold-action).
+  description: Action taken on card tap and hold. See [action documentation](/dashboards/actions/#hold-action).
   type: map
 double_tap_action:
   required: false
-  description: Action taken on card double tap. See [action documentation](/lovelace/actions/#double-tap-action).
+  description: Action taken on card double tap. See [action documentation](/dashboards/actions/#double-tap-action).
   type: map
 {% endconfiguration %}
 
@@ -71,6 +71,6 @@ name: My Office
 ```
 
 <p class='img'>
-<img src='/images/lovelace/lovelace_light_complex_card.png' alt='Screenshot of the Light card'>
+<img src='/images/dashboards/lovelace_light_complex_card.png' alt='Screenshot of the Light card'>
 Screenshot of the Light card names.
 </p>
diff --git a/source/_lovelace/logbook.markdown b/source/_dashboards/logbook.markdown
similarity index 95%
rename from source/_lovelace/logbook.markdown
rename to source/_dashboards/logbook.markdown
index 76facaf780e..702fcffe2f8 100644
--- a/source/_lovelace/logbook.markdown
+++ b/source/_dashboards/logbook.markdown
@@ -8,7 +8,7 @@ description: "The Logbook card displays entries from the logbook for specific en
 The Logbook card displays entries from the logbook for specific entities.
 
 <p class='img'>
-  <img src='/images/lovelace/lovelace_logbook.png' alt='Screenshot of the logbook card'>
+  <img src='/images/dashboards/lovelace_logbook.png' alt='Screenshot of the logbook card'>
   Screenshot of the Logbook card.
 </p>
 
diff --git a/source/_lovelace/map.markdown b/source/_dashboards/map.markdown
similarity index 96%
rename from source/_lovelace/map.markdown
rename to source/_dashboards/map.markdown
index 0753ba4cdfc..c6389b29e84 100644
--- a/source/_lovelace/map.markdown
+++ b/source/_dashboards/map.markdown
@@ -8,7 +8,7 @@ description: "The Map card that allows you to display entities on a map"
 The Map card that allows you to display entities on a map
 
 <p class='img'>
-<img src='/images/lovelace/lovelace_map_card.png' alt='Screenshot of the map card'>
+<img src='/images/dashboards/lovelace_map_card.png' alt='Screenshot of the map card'>
 Screenshot of the map card.
 </p>
 
diff --git a/source/_lovelace/markdown.markdown b/source/_dashboards/markdown.markdown
similarity index 96%
rename from source/_lovelace/markdown.markdown
rename to source/_dashboards/markdown.markdown
index a290b4133fe..87996efb88f 100644
--- a/source/_lovelace/markdown.markdown
+++ b/source/_dashboards/markdown.markdown
@@ -10,7 +10,7 @@ The Markdown card is used to render [Markdown](https://commonmark.org/help/).
 The renderer uses [Marked.js](https://marked.js.org), which supports [several specifications of Markdown](https://marked.js.org/#specifications), including CommonMark, GitHub Flavored Markdown (GFM) and `markdown.pl`.
 
 <p class='img'>
-<img src='/images/lovelace/lovelace_markdown.png' alt='Screenshot of the markdown card'>
+<img src='/images/dashboards/lovelace_markdown.png' alt='Screenshot of the markdown card'>
 Screenshot of the Markdown card.
 </p>
 
@@ -53,7 +53,7 @@ The card can also be configured using YAML, some examples below:
 ```yaml
 type: markdown
 content: >
-  ## Lovelace
+  ## Dashboards
 
   Starting with Home Assistant 0.72, we're experimenting with a new way of defining your interface.
 ```
diff --git a/source/_lovelace/masonry.markdown b/source/_dashboards/masonry.markdown
similarity index 100%
rename from source/_lovelace/masonry.markdown
rename to source/_dashboards/masonry.markdown
diff --git a/source/_lovelace/media-control.markdown b/source/_dashboards/media-control.markdown
similarity index 92%
rename from source/_lovelace/media-control.markdown
rename to source/_dashboards/media-control.markdown
index 6ecb9d6cb6e..1336ac47cc2 100644
--- a/source/_lovelace/media-control.markdown
+++ b/source/_dashboards/media-control.markdown
@@ -8,7 +8,7 @@ description: "The Media Control card is used to display media player entities on
 The Media Control card is used to display [Media Player](/integrations/#media-player) entities on an interface with easy to use controls.
 
 <p class='img'>
-<img src='/images/lovelace/lovelace_mediaplayer.png' alt='Screenshot of the media player control card'>
+<img src='/images/dashboards/lovelace_mediaplayer.png' alt='Screenshot of the media player control card'>
 Screenshot of the Media Control card.
 </p>
 
diff --git a/source/_lovelace/panel.markdown b/source/_dashboards/panel.markdown
similarity index 100%
rename from source/_lovelace/panel.markdown
rename to source/_dashboards/panel.markdown
diff --git a/source/_lovelace/picture-elements.markdown b/source/_dashboards/picture-elements.markdown
similarity index 94%
rename from source/_lovelace/picture-elements.markdown
rename to source/_dashboards/picture-elements.markdown
index b3da3774750..ffbc2c2a9de 100644
--- a/source/_lovelace/picture-elements.markdown
+++ b/source/_dashboards/picture-elements.markdown
@@ -7,10 +7,10 @@ description: "The Picture Elements card is one of the most versatile types of ca
 
 The Picture Elements card is one of the most versatile types of cards.
 
-The cards allow you to position icons or text and even services on an image based on coordinates. Imagine floor plan, imagine [picture-glance](/lovelace/picture-glance/) with no restrictions!
+The cards allow you to position icons or text and even services on an image based on coordinates. Imagine floor plan, imagine [picture-glance](/dashboards/picture-glance/) with no restrictions!
 
 <p class='img'>
-  <img src='/images/lovelace/lovelace_picture_elements.gif' alt='A functional floorplan powered by picture elements'>
+  <img src='/images/dashboards/lovelace_picture_elements.gif' alt='A functional floorplan powered by picture elements'>
   A functional floorplan powered by picture elements.
 </p>
 
@@ -97,15 +97,15 @@ title:
   type: string
 tap_action:
   required: false
-  description: Action taken on card tap. See [action documentation](/lovelace/actions/#tap-action).
+  description: Action taken on card tap. See [action documentation](/dashboards/actions/#tap-action).
   type: map
 hold_action:
   required: false
-  description: Action taken on card tap and hold. See [action documentation](/lovelace/actions/#hold-action).
+  description: Action taken on card tap and hold. See [action documentation](/dashboards/actions/#hold-action).
   type: map
 double_tap_action:
   required: false
-  description: Action taken on card double tap. See [action documentation](/lovelace/actions/#double-tap-action).
+  description: Action taken on card double tap. See [action documentation](/dashboards/actions/#double-tap-action).
   type: map
 {% endconfiguration %}
 
@@ -172,15 +172,15 @@ tap_action:
       default: "false"
 tap_action:
   required: false
-  description: Action taken on card tap. See [action documentation](/lovelace/actions/#tap-action).
+  description: Action taken on card tap. See [action documentation](/dashboards/actions/#tap-action).
   type: map
 hold_action:
   required: false
-  description: Action taken on card tap and hold. See [action documentation](/lovelace/actions/#hold-action).
+  description: Action taken on card tap and hold. See [action documentation](/dashboards/actions/#hold-action).
   type: map
 double_tap_action:
   required: false
-  description: Action taken on card double tap. See [action documentation](/lovelace/actions/#double-tap-action).
+  description: Action taken on card double tap. See [action documentation](/dashboards/actions/#double-tap-action).
   type: map
 style:
   required: true
@@ -220,15 +220,15 @@ title:
   type: string
 tap_action:
   required: false
-  description: Action taken on card tap. See [action documentation](/lovelace/actions/#tap-action).
+  description: Action taken on card tap. See [action documentation](/dashboards/actions/#tap-action).
   type: map
 hold_action:
   required: false
-  description: Action taken on card tap and hold. See [action documentation](/lovelace/actions/#hold-action).
+  description: Action taken on card tap and hold. See [action documentation](/dashboards/actions/#hold-action).
   type: map
 double_tap_action:
   required: false
-  description: Action taken on card double tap. See [action documentation](/lovelace/actions/#double-tap-action).
+  description: Action taken on card double tap. See [action documentation](/dashboards/actions/#double-tap-action).
   type: map
 style:
   required: true
@@ -288,15 +288,15 @@ entity:
   type: string
 tap_action:
   required: false
-  description: Action taken on card tap. See [action documentation](/lovelace/actions/#tap-action).
+  description: Action taken on card tap. See [action documentation](/dashboards/actions/#tap-action).
   type: map
 hold_action:
   required: false
-  description: Action taken on card tap and hold. See [action documentation](/lovelace/actions/#hold-action).
+  description: Action taken on card tap and hold. See [action documentation](/dashboards/actions/#hold-action).
   type: map
 double_tap_action:
   required: false
-  description: Action taken on card double tap. See [action documentation](/lovelace/actions/#double-tap-action).
+  description: Action taken on card double tap. See [action documentation](/dashboards/actions/#double-tap-action).
   type: map
 style:
   required: true
@@ -324,15 +324,15 @@ title:
   type: string
 tap_action:
   required: false
-  description: Action taken on card tap. See [action documentation](/lovelace/actions/#tap-action).
+  description: Action taken on card tap. See [action documentation](/dashboards/actions/#tap-action).
   type: map
 hold_action:
   required: false
-  description: Action taken on card tap and hold. See [action documentation](/lovelace/actions/#hold-action).
+  description: Action taken on card tap and hold. See [action documentation](/dashboards/actions/#hold-action).
   type: map
 double_tap_action:
   required: false
-  description: Action taken on card double tap. See [action documentation](/lovelace/actions/#double-tap-action).
+  description: Action taken on card double tap. See [action documentation](/dashboards/actions/#double-tap-action).
   type: map
 image:
   required: false
diff --git a/source/_lovelace/picture-entity.markdown b/source/_dashboards/picture-entity.markdown
similarity index 93%
rename from source/_lovelace/picture-entity.markdown
rename to source/_dashboards/picture-entity.markdown
index 5fe174d1c79..c916d07f368 100644
--- a/source/_lovelace/picture-entity.markdown
+++ b/source/_dashboards/picture-entity.markdown
@@ -8,7 +8,7 @@ description: The Picture Entity card displays an entity in the form of an image.
 The Picture Entity card displays an entity in the form of an image. Instead of images from URL, it can also show the picture of `camera` entities.
 
 <p class='img'>
-  <img src='/images/lovelace/lovelace_picture_entity.gif' alt='Picture entity card'>
+  <img src='/images/dashboards/lovelace_picture_entity.gif' alt='Picture entity card'>
   Background changes according to the entity state.
 </p>
 
@@ -66,15 +66,15 @@ theme:
   type: string
 tap_action:
   required: false
-  description: Action taken on card tap. See [action documentation](/lovelace/actions/#tap-action).
+  description: Action taken on card tap. See [action documentation](/dashboards/actions/#tap-action).
   type: map
 hold_action:
   required: false
-  description: Action taken on card tap and hold. See [action documentation](/lovelace/actions/#hold-action).
+  description: Action taken on card tap and hold. See [action documentation](/dashboards/actions/#hold-action).
   type: map
 double_tap_action:
   required: false
-  description: Action taken on card double tap. See [action documentation](/lovelace/actions/#double-tap-action).
+  description: Action taken on card double tap. See [action documentation](/dashboards/actions/#double-tap-action).
   type: map
 {% endconfiguration %}
 
diff --git a/source/_lovelace/picture-glance.markdown b/source/_dashboards/picture-glance.markdown
similarity index 93%
rename from source/_lovelace/picture-glance.markdown
rename to source/_dashboards/picture-glance.markdown
index b7817d0e2ba..02b013b24af 100644
--- a/source/_lovelace/picture-glance.markdown
+++ b/source/_dashboards/picture-glance.markdown
@@ -8,7 +8,7 @@ description: "The Picture Glance card shows an image and corresponding entity st
 The Picture Glance card shows an image and corresponding entity states as an icon. The entities on the right side allow toggle actions, others show the more information dialog.
 
 <p class='img'>
-  <img src='/images/lovelace/lovelace_picture_glance.gif' alt='Picture glance card for a living room'>
+  <img src='/images/dashboards/lovelace_picture_glance.gif' alt='Picture glance card for a living room'>
   Picture glance card for a living room.
 </p>
 
@@ -70,15 +70,15 @@ theme:
   type: string
 tap_action:
   required: false
-  description: Action taken on card tap. See [action documentation](/lovelace/actions/#tap-action).
+  description: Action taken on card tap. See [action documentation](/dashboards/actions/#tap-action).
   type: map
 hold_action:
   required: false
-  description: Action taken on card tap and hold. See [action documentation](/lovelace/actions/#hold-action).
+  description: Action taken on card tap and hold. See [action documentation](/dashboards/actions/#hold-action).
   type: map
 double_tap_action:
   required: false
-  description: Action taken on card double tap. See [action documentation](/lovelace/actions/).
+  description: Action taken on card double tap. See [action documentation](/dashboards/actions/).
   type: map
 {% endconfiguration %}
 
@@ -114,15 +114,15 @@ show_state:
   default: true
 tap_action:
   required: false
-  description: Action taken on card tap. See [action documentation](/lovelace/actions/#tap-action).
+  description: Action taken on card tap. See [action documentation](/dashboards/actions/#tap-action).
   type: map
 hold_action:
   required: false
-  description: Action taken on card tap and hold. See [action documentation](/lovelace/actions/#hold-action).
+  description: Action taken on card tap and hold. See [action documentation](/dashboards/actions/#hold-action).
   type: map
 double_tap_action:
   required: false
-  description: Action taken on card double tap. See [action documentation](/lovelace/actions/#double-tap-action).
+  description: Action taken on card double tap. See [action documentation](/dashboards/actions/#double-tap-action).
   type: map
 {% endconfiguration %}
 
diff --git a/source/_lovelace/picture.markdown b/source/_dashboards/picture.markdown
similarity index 86%
rename from source/_lovelace/picture.markdown
rename to source/_dashboards/picture.markdown
index 79cc23d89c5..cc297fae662 100644
--- a/source/_lovelace/picture.markdown
+++ b/source/_dashboards/picture.markdown
@@ -8,7 +8,7 @@ description: "The Picture card allows you to set an image to use for navigation
 The Picture card allows you to set an image to use for navigation to various paths in your interface or to call a service.
 
 <p class='img'>
-<img src='/images/lovelace/lovelace_picture.png' alt='Screenshot of the picture card'>
+<img src='/images/dashboards/lovelace_picture.png' alt='Screenshot of the picture card'>
 Screenshot of the picture card.
 </p>
 
@@ -27,15 +27,15 @@ theme:
   type: string
 tap_action:
   required: false
-  description: Action taken on card tap. See [action documentation](/lovelace/actions/#tap-action).
+  description: Action taken on card tap. See [action documentation](/dashboards/actions/#tap-action).
   type: map
 hold_action:
   required: false
-  description: Action taken on card tap and hold. See [action documentation](/lovelace/actions/#hold-action).
+  description: Action taken on card tap and hold. See [action documentation](/dashboards/actions/#hold-action).
   type: map
 double_tap_action:
   required: false
-  description: Action taken on card double tap. See [action documentation](/lovelace/actions/#double-tap-action).
+  description: Action taken on card double tap. See [action documentation](/dashboards/actions/#double-tap-action).
   type: map
 {% endconfiguration %}
 
@@ -60,7 +60,7 @@ tap_action:
   navigation_path: /lovelace/home
 ```
 
-Check the [views](/lovelace/views/) setup on how to setup custom IDs.
+Check the [views](/dashboards/views/) setup on how to setup custom IDs.
 
 Toggle entity using a service:
 
diff --git a/source/_lovelace/plant-status.markdown b/source/_dashboards/plant-status.markdown
similarity index 92%
rename from source/_lovelace/plant-status.markdown
rename to source/_dashboards/plant-status.markdown
index 21e7385ea17..2041bc6eb60 100644
--- a/source/_lovelace/plant-status.markdown
+++ b/source/_dashboards/plant-status.markdown
@@ -8,7 +8,7 @@ description: "The Plant Status card is for all the lovely botanists out there."
 The Plant Status card is for all the lovely botanists out there.
 
 <p class='img'>
-<img src='/images/lovelace/lovelace_plant_card.png' alt='Screenshot of the plant status card'>
+<img src='/images/dashboards/lovelace_plant_card.png' alt='Screenshot of the plant status card'>
 Screenshot of the plant status card.
 </p>
 
diff --git a/source/_lovelace/sensor.markdown b/source/_dashboards/sensor.markdown
similarity index 96%
rename from source/_lovelace/sensor.markdown
rename to source/_dashboards/sensor.markdown
index cc267aaef14..82c8309708a 100644
--- a/source/_lovelace/sensor.markdown
+++ b/source/_dashboards/sensor.markdown
@@ -8,7 +8,7 @@ description: "The Sensor card gives you a quick overview of your sensors state w
 The Sensor card gives you a quick overview of your sensors state with an optional graph to visualize change over time.
 
 <p class='img'>
-  <img src='/images/lovelace/lovelace_sensor.png' alt='Screenshot of the sensor card'>
+  <img src='/images/dashboards/lovelace_sensor.png' alt='Screenshot of the sensor card'>
   Screenshot of the sensor card.
 </p>
 
diff --git a/source/_lovelace/shopping-list.markdown b/source/_dashboards/shopping-list.markdown
similarity index 92%
rename from source/_lovelace/shopping-list.markdown
rename to source/_dashboards/shopping-list.markdown
index 9f70ff2c7f0..7b4a6b4f6d0 100644
--- a/source/_lovelace/shopping-list.markdown
+++ b/source/_dashboards/shopping-list.markdown
@@ -10,7 +10,7 @@ The Shopping List card allows you to add, edit, check-off, and clear items from
 Setup of the [Shopping List integration](/integrations/shopping_list/) is required.
 
 <p class='img'>
-<img src='/images/lovelace/lovelace_shopping_list_card.gif' alt='Screenshot of the shopping list card'>
+<img src='/images/dashboards/lovelace_shopping_list_card.gif' alt='Screenshot of the shopping list card'>
 Screenshot of the Shopping List card.
 </p>
 
diff --git a/source/_lovelace/sidebar.markdown b/source/_dashboards/sidebar.markdown
similarity index 100%
rename from source/_lovelace/sidebar.markdown
rename to source/_dashboards/sidebar.markdown
diff --git a/source/_lovelace/statistics-graph.markdown b/source/_dashboards/statistics-graph.markdown
similarity index 90%
rename from source/_lovelace/statistics-graph.markdown
rename to source/_dashboards/statistics-graph.markdown
index 55bd508e24f..1f76e7c00fd 100644
--- a/source/_lovelace/statistics-graph.markdown
+++ b/source/_dashboards/statistics-graph.markdown
@@ -12,12 +12,12 @@ Statistics are gathered every hour for sensors that support it. It will either k
 If your sensor doesn't work with statistics, check [this](/more-info/statistics/).
 
 <p class='img'>
-<img src='/images/lovelace/lovelace_statistics_graph_line.png' alt='Screenshot of the statistics graph card for power entities'>
+<img src='/images/dashboards/lovelace_statistics_graph_line.png' alt='Screenshot of the statistics graph card for power entities'>
 Screenshot of the Statistics Graph card with none metered entities and `chart_type` `line`.
 </p>
 
 <p class='img'>
-<img src='/images/lovelace/lovelace_statistics_graph_bar.png' alt='Screenshot of the statistics graph card for energy entities'>
+<img src='/images/dashboards/lovelace_statistics_graph_bar.png' alt='Screenshot of the statistics graph card for energy entities'>
 Screenshot of the Statistics Graph card with a metered entity and `chart_type` `bar`.
 </p>
 
diff --git a/source/_lovelace/thermostat.markdown b/source/_dashboards/thermostat.markdown
similarity index 93%
rename from source/_lovelace/thermostat.markdown
rename to source/_dashboards/thermostat.markdown
index f8b2be20db5..1db32b87dfb 100644
--- a/source/_lovelace/thermostat.markdown
+++ b/source/_dashboards/thermostat.markdown
@@ -8,7 +8,7 @@ description: "The Thermostat card gives control of your climate entity, allowing
 The Thermostat card gives control of your [climate](/integrations/#climate) entity, allowing you to change the temperature and mode of the entity.
 
 <p class='img'>
-  <img src='/images/lovelace/lovelace_thermostat_card.gif' alt='Screenshot of the thermostat card'>
+  <img src='/images/dashboards/lovelace_thermostat_card.gif' alt='Screenshot of the thermostat card'>
   Screenshot of the Thermostat card.
 </p>
 
diff --git a/source/_lovelace/vertical-stack.markdown b/source/_dashboards/vertical-stack.markdown
similarity index 87%
rename from source/_lovelace/vertical-stack.markdown
rename to source/_dashboards/vertical-stack.markdown
index c330378bf26..1f90c45fb42 100644
--- a/source/_lovelace/vertical-stack.markdown
+++ b/source/_dashboards/vertical-stack.markdown
@@ -43,7 +43,7 @@ cards:
 ```
 
 <p class="img">
-  <img src="/images/lovelace/lovelace_vertical-stack.png" alt="Picture- and entities-card in a stack">
+  <img src="/images/dashboards/lovelace_vertical-stack.png" alt="Picture- and entities-card in a stack">
   Picture and entities-card in a stack.
 </p>
 
@@ -66,6 +66,6 @@ cards:
 ```
 
 <p class="img">
-  <img src="/images/lovelace/lovelace_vertical-horizontal-stack.png" alt="Create a grid layout using vertical and horizontal stack">
+  <img src="/images/dashboards/lovelace_vertical-horizontal-stack.png" alt="Create a grid layout using vertical and horizontal stack">
   Create a grid layout using vertical and horizontal stack.
 </p>
diff --git a/source/_lovelace/weather-forecast.markdown b/source/_dashboards/weather-forecast.markdown
similarity index 93%
rename from source/_lovelace/weather-forecast.markdown
rename to source/_dashboards/weather-forecast.markdown
index 3fd1654cb2c..0d4fff6c876 100644
--- a/source/_lovelace/weather-forecast.markdown
+++ b/source/_dashboards/weather-forecast.markdown
@@ -8,7 +8,7 @@ description: "The Weather Forecast card displays the weather. Very useful to inc
 The Weather Forecast card displays the weather. Very useful to include on interfaces that people display on the wall.
 
 <p class='img'>
-  <img src='/images/lovelace/lovelace_weather.png' alt='Screenshot of the weather card'>
+  <img src='/images/dashboards/lovelace_weather.png' alt='Screenshot of the weather card'>
   Screenshot of the Weather card.
 </p>
 
@@ -71,15 +71,15 @@ theme:
   type: string
 tap_action:
   required: false
-  description: The action taken on card tap. For more information, see the [action documentation](/lovelace/actions/#tap-action).
+  description: The action taken on card tap. For more information, see the [action documentation](/dashboards/actions/#tap-action).
   type: map
 hold_action:
   required: false
-  description: The action taken on card tap and hold. For more information, see the [action documentation](/lovelace/actions/#hold-action).
+  description: The action taken on card tap and hold. For more information, see the [action documentation](/dashboards/actions/#hold-action).
   type: map
 double_tap_action:
   required: false
-  description: The action taken on card double-tap. For more information, see the [action documentation](/lovelace/actions/#double-tap-action).
+  description: The action taken on card double-tap. For more information, see the [action documentation](/dashboards/actions/#double-tap-action).
   type: map
 {% endconfiguration %}
 
diff --git a/source/_data/glossary.yml b/source/_data/glossary.yml
index f3bb15f0eeb..e7ec2cd1ade 100644
--- a/source/_data/glossary.yml
+++ b/source/_data/glossary.yml
@@ -45,7 +45,7 @@
 - topic: Integration
   description: "[Integrations](/integrations/) connect and integrates Home Assistant with devices, services, and more. Such an integration contains all the logic that takes care of vendor- and device-specific implementations such as authentication or special protocols and brings those into Home Assistant in a standardized way. For example, the [Hue](/integrations/hue) integration integrates the Philips Hue bridge and its connected bulbs into Home Assistant, making them available as Home Assistant light entities you can control."
 - topic: Lovelace
-  description: "[Lovelace](/lovelace/) is the name of the current frontend."
+  description: "Lovelace is the original code name of the UI that is now known as [Home Assistant dashboards](/dashboards)."
 - topic: Light
   description: "A [light](/integrations/light) has a brightness you can control, and optionally color temperature or RGB color control."
 - topic: Notification
diff --git a/source/_docs/scripts/service-calls.markdown b/source/_docs/scripts/service-calls.markdown
index 8088732119e..d2312056b28 100644
--- a/source/_docs/scripts/service-calls.markdown
+++ b/source/_docs/scripts/service-calls.markdown
@@ -3,7 +3,7 @@ title: "Service Calls"
 description: "Instructions on how to call services in Home Assistant."
 ---
 
-Various integrations allow calling services when a certain event occurs. The most common one is calling a service when an automation trigger happens. But a service can also be called from a script, a Lovelace dashboard or via voice command devices such as Amazon Echo.
+Various integrations allow calling services when a certain event occurs. The most common one is calling a service when an automation trigger happens. But a service can also be called from a script, a dashboard or via voice command devices such as Amazon Echo.
 
 The configuration options to call a configuration are the same between all integrations and are described on this page.
 
diff --git a/source/_includes/asides/lovelace_navigation.html b/source/_includes/asides/dashboards_navigation.html
similarity index 69%
rename from source/_includes/asides/lovelace_navigation.html
rename to source/_includes/asides/dashboards_navigation.html
index 08cc065b9ef..ef9bdfdcf4d 100644
--- a/source/_includes/asides/lovelace_navigation.html
+++ b/source/_includes/asides/dashboards_navigation.html
@@ -1,21 +1,21 @@
 <section class="aside-module grid__item one-whole lap-one-half">
-  {% assign elements = site.lovelace | sort_natural: 'title' %}
+  {% assign elements = site.dashboards | sort_natural: 'title' %}
 
   <div class="section">
-    <h1 class="title delta">Lovelace UI</h1>
+    <h1 class="title delta">Dashboards</h1>
     <ul class="divided sidebar-menu">
-      <li>{% active_link /lovelace/ Introduction %}</li>
+      <li>{% active_link /dashboards/ Introduction %}</li>
       <li>
-        {% active_link /lovelace/dashboards/ Dashboards %}
+        {% active_link /dashboards/dashboards/ Multiple Dashboards %}
       </li>
       <li>
-        {% active_link /lovelace/views/ Views %}
+        {% active_link /dashboards/views/ Views %}
       </li>
       <li>
-        {% active_link /lovelace/cards/ Cards %}
+        {% active_link /dashboards/cards/ Cards %}
       </li>
       <li>
-        {% active_link /lovelace/badges/ Badges %}
+        {% active_link /dashboards/badges/ Badges %}
       </li>
     </ul>
   </div>
@@ -45,8 +45,8 @@
   <div class="section">
     <h1 class="title delta">Advanced</h1>
     <ul class="divided sidebar-menu">
-      <li>{% active_link /lovelace/header-footer/ Headers & Footers %}</li>
-      <li>{% active_link /lovelace/actions/ Actions %}</li>
+      <li>{% active_link /dashboards/header-footer/ Headers & Footers %}</li>
+      <li>{% active_link /dashboards/actions/ Actions %}</li>
       <li>
         <a
           href="https://developers.home-assistant.io/docs/frontend/custom-ui/lovelace-custom-card.html"
diff --git a/source/_includes/asides/docs_navigation.html b/source/_includes/asides/docs_navigation.html
index 044ffacd5d6..a47f0c7e9a1 100644
--- a/source/_includes/asides/docs_navigation.html
+++ b/source/_includes/asides/docs_navigation.html
@@ -125,7 +125,7 @@
             {% active_link /docs/frontend/browsers/ Browser Compatibility List
             %}
           </li>
-          <li>{% active_link /lovelace Lovelace UI %}</li>
+          <li>{% active_link /dashboards Dashboards %}</li>
         </ul>
       </li>
       <li>
diff --git a/source/_includes/site/header.html b/source/_includes/site/header.html
index 7967ddd9427..c92e1137bc7 100644
--- a/source/_includes/site/header.html
+++ b/source/_includes/site/header.html
@@ -39,7 +39,7 @@
                 <a href="/docs/scripts/">Scripting</a>
               </li>
               <li>
-                <a href="/lovelace/">User Interface</a>
+                <a href="/dashboards/">Dashboards</a>
               </li>
             </ul>
           </li>
diff --git a/source/_includes/site/sidebar.html b/source/_includes/site/sidebar.html
index ad4dad554bc..2636a7cab90 100644
--- a/source/_includes/site/sidebar.html
+++ b/source/_includes/site/sidebar.html
@@ -7,8 +7,8 @@
     {% include asides/installation_navigation.html %}
   {% elsif root == 'common-tasks' %}
     {% include asides/common_tasks_navigation.html %}
-  {% elsif root == 'lovelace' %}
-    {% include asides/lovelace_navigation.html %}
+  {% elsif root == 'dashboards' %}
+    {% include asides/dashboards_navigation.html %}
   {% elsif root == 'developers' or root == 'help' %}
     {% include asides/help_navigation.html %}
   {% elsif root == 'getting-started' %}
diff --git a/source/_integrations/almond.markdown b/source/_integrations/almond.markdown
index 041b13d0a77..4a645d1d161 100644
--- a/source/_integrations/almond.markdown
+++ b/source/_integrations/almond.markdown
@@ -12,7 +12,7 @@ ha_codeowners:
 ha_domain: almond
 ---
 
-[Almond](https://almond.stanford.edu/) is an open, privacy-preserving virtual assistant by [Stanford Open Virtual Assistant Lab](https://oval.cs.stanford.edu/). It allows you, among other things, to control Home Assistant using natural language. Once installed, it will be available on Lovelace via the microphone icon in the top right.
+[Almond](https://almond.stanford.edu/) is an open, privacy-preserving virtual assistant by [Stanford Open Virtual Assistant Lab](https://oval.cs.stanford.edu/). It allows you, among other things, to control Home Assistant using natural language. Once installed, it will be available in the user interface via the microphone icon in the top right.
 
 Almond consists of three parts:
 
diff --git a/source/_integrations/binary_sensor.markdown b/source/_integrations/binary_sensor.markdown
index fb769c6d3cf..722be9876af 100644
--- a/source/_integrations/binary_sensor.markdown
+++ b/source/_integrations/binary_sensor.markdown
@@ -27,7 +27,7 @@ or using an [input boolean helper](/integrations/input_boolean),
 ### Device Class
 
 Knowing a sensor is binary impacts how the sensor's current state may be
-represented in Home Assistant's UI (see [Lovelace](/lovelace/)). Opposing states
+represented in Home Assistant's UI (see [Dashboards](/dashboards/)). Opposing states
 may be given different icons, colors, and value labels to highlight a particular
 state over the other. This is set by the binary sensor's device class.
 
diff --git a/source/_integrations/cast.markdown b/source/_integrations/cast.markdown
index ff2d8da34b7..5ffd7f4d9cd 100644
--- a/source/_integrations/cast.markdown
+++ b/source/_integrations/cast.markdown
@@ -32,7 +32,7 @@ Ignore CEC:
 
 ## Home Assistant Cast
 
-Home Assistant has its own Cast application to show the Home Assistant UI on any Chromecast device.  You can use it by adding the [Cast entity row](/lovelace/entities/#cast) to your Lovelace UI, or by calling the `cast.show_lovelace_view` service. The service takes the path of a Lovelace view and an entity ID of a Cast device to show the view on. A `path` has to be defined in your Lovelace YAML for each view, as outlined in the [views documentation](/lovelace/views/#path). The `dashboard_path` is the part of the Lovelace UI URL that follows the defined `base_url`, typically "lovelace". The following is a full configuration for a script that starts casting the `downstairs` tab of the `lovelace-cast` path (note that `entity_id` is specified under `data` and not for the service call):
+Home Assistant has its own Cast application to show the Home Assistant UI on any Chromecast device.  You can use it by adding the [Cast entity row](/dashboards/entities/#cast) to your dashboards, or by calling the `cast.show_lovelace_view` service. The service takes the path of a dashboard view and an entity ID of a Cast device to show the view on. A `path` has to be defined in your dashboard's YAML for each view, as outlined in the [views documentation](/dashboards/views/#path). The `dashboard_path` is the part of the dashboard URL that follows the defined `base_url`, typically "lovelace". The following is a full configuration for a script that starts casting the `downstairs` tab of the `lovelace-cast` path (note that `entity_id` is specified under `data` and not for the service call):
 
 ```yaml
 cast_downstairs_on_kitchen:
diff --git a/source/_integrations/delijn.markdown b/source/_integrations/delijn.markdown
index cdba0250ef7..4809e1be66e 100644
--- a/source/_integrations/delijn.markdown
+++ b/source/_integrations/delijn.markdown
@@ -73,6 +73,6 @@ sensor:
       number_of_departures: 20
 ```
 
-## Custom Lovelace card
+## Custom dashboard card
 
-Works best with the following custom Lovelace card: <https://github.com/bollewolle/delijn-card>
+Works best with the following custom dashboard card: <https://github.com/bollewolle/delijn-card>
diff --git a/source/_integrations/filter.markdown b/source/_integrations/filter.markdown
index 78cb9f357f4..522f62230fd 100644
--- a/source/_integrations/filter.markdown
+++ b/source/_integrations/filter.markdown
@@ -16,7 +16,7 @@ ha_platforms:
 
 The `filter` platform enables sensors that process the states of other entities.
 
-`filter` applies a signal processing algorithm to a sensor, previous and current states, and generates a `new state` given the chosen algorithm. The next image depicts an original sensor and the filter sensor of that same sensor using the [History Graph](/lovelace/history-graph/) component.
+`filter` applies a signal processing algorithm to a sensor, previous and current states, and generates a `new state` given the chosen algorithm. The next image depicts an original sensor and the filter sensor of that same sensor using the [History Graph](/dashboards/history-graph/) component.
 
 <p class='img'>
   <img src='/images/screenshots/filter-sensor.png' />
diff --git a/source/_integrations/fireservicerota.markdown b/source/_integrations/fireservicerota.markdown
index d85b7981633..cf34b90e110 100644
--- a/source/_integrations/fireservicerota.markdown
+++ b/source/_integrations/fireservicerota.markdown
@@ -164,7 +164,7 @@ automation:
 ```
 
 
-### Example Lovelace Dashboard
+### Example Dashboard
 
 ```yaml
 panel: true
diff --git a/source/_integrations/history_stats.markdown b/source/_integrations/history_stats.markdown
index d75bae58ecd..57968913202 100644
--- a/source/_integrations/history_stats.markdown
+++ b/source/_integrations/history_stats.markdown
@@ -52,7 +52,7 @@ state:
   required: true
   type: [list, string]
 name:
-  description: Name displayed on the frontend. Note that it is used by Home Assistant to generate sensor's `object_id` so it is advisable to choose a unique one and change name for frontend using [customization](/docs/configuration/customizing-devices/#friendly_name) or via [Lovelace](/lovelace/entities/#name).
+  description: Name displayed on the frontend. Note that it is used by Home Assistant to generate sensor's `object_id` so it is advisable to choose a unique one and change name for frontend using [customization](/docs/configuration/customizing-devices/#friendly_name) or via [Dashboards](/dashboards/entities/#name).
   required: false
   default: unnamed statistics
   type: string
diff --git a/source/_integrations/map.markdown b/source/_integrations/map.markdown
index 1a020436e28..3ddfe0d8edf 100644
--- a/source/_integrations/map.markdown
+++ b/source/_integrations/map.markdown
@@ -21,6 +21,6 @@ Devices that are currently at home won't show on the map.
 
 <div class='note'>
   
-This map always shows the location of all tracked devices. If you want to hide certain entities, you should look into the [Map Card](/lovelace/map/).
+This map always shows the location of all tracked devices. If you want to hide certain entities, you should look into the [Map Card](/dashboards/map/).
 
 </div>
diff --git a/source/_integrations/meteo_france.markdown b/source/_integrations/meteo_france.markdown
index f2d2e518469..73f13d89d38 100644
--- a/source/_integrations/meteo_france.markdown
+++ b/source/_integrations/meteo_france.markdown
@@ -31,7 +31,7 @@ It displays the current weather along with a 5 days forecast and create sensors,
 
 ## Weather platform
 
-To be used with the weather Lovelace card to access current condition, today and next four days forecast.
+To be used with the weather dashboard card to access current condition, today and next four days forecast.
 
 The weather platform can be configured in the frontend to decide if the forecast is given daily (default) or hourly. To change the setting go in **Configuration** -> **Devices & Services**, click on the city name in **Météo-France** box and click on **Options**. You can update the `Forecast mode` by choosing between `daily` or `hourly`.
 
diff --git a/source/_integrations/motioneye.markdown b/source/_integrations/motioneye.markdown
index d6e2fb6219a..267503f7a83 100644
--- a/source/_integrations/motioneye.markdown
+++ b/source/_integrations/motioneye.markdown
@@ -296,9 +296,9 @@ of the "overlapping" cameras are queried. Use different root directories (in mot
 `File Storage -> Root Directory`) to ensure motionEye (and thus this integration) will
 correctly associate media with the camera from which that media was captured.
 
-## Example Lovelace Card
+## Example Dashboard Card
 
-A Lovelace card with icons that will call the `action` service to send action commands to motionEye.
+A dashboard card with icons that will call the `action` service to send action commands to motionEye.
 
 ```yaml
 - type: picture-glance
diff --git a/source/_integrations/nest.markdown b/source/_integrations/nest.markdown
index 1e7de3a872d..9603d92e501 100644
--- a/source/_integrations/nest.markdown
+++ b/source/_integrations/nest.markdown
@@ -303,7 +303,7 @@ Additional Nest Temperature Sensors are not supported by the SDM API.
 Home Assistant supports all SDM API features. However, every Camera or Doorbell device has a different set of built-in capabilities. A Camera device has one of the following live stream types:
 
 - **RTSP**: These devices have an HLS stream served by the Home Assistant Core. These cameras support server-side `camera` services like stream recording or image preview. See [Low Latency HLS](/integrations/stream#ll-hls) as a great option to enable to reduce stream latency.
-- **WebRTC**: These devices support direct browser to camera communication and a super low latency stream. A [Picture Glance Card](/lovelace/picture-glance/) can show the live stream in the grid with the *Camera View* set to `live` (not recommended for battery-powered cameras). `camera` services like stream recording are *not supported*.
+- **WebRTC**: These devices support direct browser to camera communication and a super low latency stream. A [Picture Glance Card](/dashboards/picture-glance/) can show the live stream in the grid with the *Camera View* set to `live` (not recommended for battery-powered cameras). `camera` services like stream recording are *not supported*.
 
 <div class='note'>
 
diff --git a/source/_integrations/panel_iframe.markdown b/source/_integrations/panel_iframe.markdown
index cfbe1b1f535..99a0e374c01 100644
--- a/source/_integrations/panel_iframe.markdown
+++ b/source/_integrations/panel_iframe.markdown
@@ -66,6 +66,6 @@ panel_iframe:
 
 <div class='note warning'>
 
-Do **not** create one that is named `lovelace` it will overwrite Lovelace causing it to never load.
+Do **not** create one that is named `lovelace` it will overwrite existing Dashboards, causing it to never load.
 
 </div>
diff --git a/source/_integrations/seventeentrack.markdown b/source/_integrations/seventeentrack.markdown
index ed6a81379af..3c3094cdb98 100644
--- a/source/_integrations/seventeentrack.markdown
+++ b/source/_integrations/seventeentrack.markdown
@@ -53,7 +53,7 @@ show_delivered:
 
 ## Examples
 
-### Lovelace summary card
+### Dashboard summary card
 
 Use the following templated Markdown card to list all packages in transit along with their status:
 
diff --git a/source/_integrations/shopping_list.markdown b/source/_integrations/shopping_list.markdown
index 4506103e339..ba8f35524ef 100644
--- a/source/_integrations/shopping_list.markdown
+++ b/source/_integrations/shopping_list.markdown
@@ -12,7 +12,7 @@ ha_domain: shopping_list
 
 The `shopping_list` integration allows you to keep track of shopping list items. 
 
-Your shopping list will be accessible from the sidebar, and you can optionally add the [Shopping List card](/lovelace/shopping-list/) to your Lovelace dashboard. With the [Conversation integration](/integrations/conversation/) you can add items to your shopping list using voice commands like "Add eggs to my shopping list." 
+Your shopping list will be accessible from the sidebar, and you can optionally add the [Shopping List card](/dashboards/shopping-list/) to your dashboard. With the [Conversation integration](/integrations/conversation/) you can add items to your shopping list using voice commands like "Add eggs to my shopping list." 
 
 {% include integrations/config_flow.md %}
 
diff --git a/source/_integrations/system_health.markdown b/source/_integrations/system_health.markdown
index d71bd8879b8..e8dbcb79e99 100644
--- a/source/_integrations/system_health.markdown
+++ b/source/_integrations/system_health.markdown
@@ -19,4 +19,4 @@ system_health:
 
 System Health integration data can be viewed at **Configuration** -> **Info**.
 
-Data includes information about your system architecture, operating system and version, Home Assistant installation type and version, Python version, frontend version, the number of Lovelace [Dashboards](/lovelace/dashboards/) and [Views](/lovelace/views/) you have, and more.
+Data includes information about your system architecture, operating system and version, Home Assistant installation type and version, Python version, frontend version, the number of [Dashboards](/dashboards/dashboards/) and [Views](/dashboards/views/) you have, and more.
diff --git a/source/_integrations/transmission.markdown b/source/_integrations/transmission.markdown
index 21eb1e6bdbe..4759e4c9273 100644
--- a/source/_integrations/transmission.markdown
+++ b/source/_integrations/transmission.markdown
@@ -120,7 +120,7 @@ Stops a torrent.
 
 ### Attribute `torrent_info`
 
-All `*_torrents` sensors e.g. `sensor.transmission_total_torrents` or `sensor.transmission_started_torrents` have a state attribute `torrent_info` that contains information about the torrents that are currently in a corresponding state. You can see this information in **Developer Tools** -> **States** -> `sensor.transmission_total_torrents` -> **Attributes**, or by adding a [Markdown card](/lovelace/markdown/) to Lovelace with the following code:
+All `*_torrents` sensors e.g. `sensor.transmission_total_torrents` or `sensor.transmission_started_torrents` have a state attribute `torrent_info` that contains information about the torrents that are currently in a corresponding state. You can see this information in **Developer Tools** -> **States** -> `sensor.transmission_total_torrents` -> **Attributes**, or by adding a [Markdown card](/dashboards/markdown/) to a dashboard with the following code:
 
 {% raw %}
 
diff --git a/source/_integrations/usgs_earthquakes_feed.markdown b/source/_integrations/usgs_earthquakes_feed.markdown
index 3d79c9ab690..76ab2b56130 100644
--- a/source/_integrations/usgs_earthquakes_feed.markdown
+++ b/source/_integrations/usgs_earthquakes_feed.markdown
@@ -122,7 +122,7 @@ geo_location:
 ```
 ## Card Example
 
-Assuming you configure this service using `feed_type: past_week_all_earthquakes`, you can create a corresponding map card in the Lovelace UI with the following card:
+Assuming you configure this service using `feed_type: past_week_all_earthquakes`, you can create a corresponding map card in a dashboard with the following card:
 ```yaml
 type: map
 geo_location_sources:
diff --git a/source/_integrations/waze_travel_time.markdown b/source/_integrations/waze_travel_time.markdown
index 2526ee58fd3..e44cb1e4760 100644
--- a/source/_integrations/waze_travel_time.markdown
+++ b/source/_integrations/waze_travel_time.markdown
@@ -104,5 +104,5 @@ In this example we are using the entity ID of a zone as the origin and the frien
 ## Using the live map in an iFrame
 
 If you plan to use [Waze's live map](https://developers.google.com/waze/iframe/)
-in Lovelace [iframe](/lovelace/iframe/) then use
+in a dashboard [iframe](/dashboards/iframe/) then use
 [https://embed.waze.com/iframe](https://embed.waze.com/iframe) and not the live map URL itself.
diff --git a/source/_integrations/xbox.markdown b/source/_integrations/xbox.markdown
index 2c8d1b67da0..abf9be38325 100644
--- a/source/_integrations/xbox.markdown
+++ b/source/_integrations/xbox.markdown
@@ -100,11 +100,11 @@ delay_sec: 0.1
 
 ### Picture Elements Card
 
-Below is a picture elements card that can be added to Lovelace to provide an Xbox controller interface in your frontend. It utilizes the services detailed above. Replace `remote.xboxone_remote` and `media_player.xboxone` with the names of your entities and enjoy! Courtesy of [@SeanPM5](https://github.com/SeanPM5) and [@hunterjm](https://github.com/hunterjm).
+Below is a picture elements card that can be added to a dashboard to provide an Xbox controller interface in your frontend. It utilizes the services detailed above. Replace `remote.xboxone_remote` and `media_player.xboxone` with the names of your entities and enjoy! Courtesy of [@SeanPM5](https://github.com/SeanPM5) and [@hunterjm](https://github.com/hunterjm).
 
 <p class='img'>
-  <img src='/images/integrations/xbox/xbox_picture_entity.png' alt='Screenshot showing Xbox Controller in Lovelace.'>
-  Screenshot showing Xbox Controller in Lovelace.
+  <img src='/images/integrations/xbox/xbox_picture_entity.png' alt='Screenshot showing Xbox Controller in a dashboard.'>
+  Screenshot showing Xbox Controller in a dashboard.
 </p>
 
 ```yaml
diff --git a/source/_integrations/xiaomi_miio.markdown b/source/_integrations/xiaomi_miio.markdown
index 482f20d8b4b..e40d97496f1 100644
--- a/source/_integrations/xiaomi_miio.markdown
+++ b/source/_integrations/xiaomi_miio.markdown
@@ -1103,7 +1103,7 @@ remote:
           - pronto:pronto_hex:[optional_repeat]
 ```
 
-### Add command as entity button in Lovelace UI
+### Add command as entity button to a dashboard
 
 ```yaml
 type: entity-button
diff --git a/source/_integrations/yandex_transport.markdown b/source/_integrations/yandex_transport.markdown
index 35ec3682a4a..61099251e58 100644
--- a/source/_integrations/yandex_transport.markdown
+++ b/source/_integrations/yandex_transport.markdown
@@ -72,7 +72,7 @@ sensor:
 
 ## Options For Entities
 
-You can configure view information about the next bus using Lovelace card.
+You can configure view information about the next bus using dashboard card.
 To enable displaying the relative time in your `default_view` add the following lines:
 
 ```yaml
diff --git a/source/_posts/2018-07-06-release-73.markdown b/source/_posts/2018-07-06-release-73.markdown
index e94be71d26d..7f8e8a8e05e 100644
--- a/source/_posts/2018-07-06-release-73.markdown
+++ b/source/_posts/2018-07-06-release-73.markdown
@@ -17,7 +17,7 @@ In the meanwhile, we're also working hard on the new authentication system. A pr
 
 This release also includes a TON of love for the new Lovelace UI. Yes, it's still experimental but daaang, it's already so awesome that you should probably just go ahead and try it out. Thanks to all the devs who have jumped on this: [@c727], [@ciotlosm] and [@jeradM].
 
-We don't have time to go through all the changes in this release, but [@ciotlosm] has been keeping [a very detailed changelog](/lovelace/changelog/). I'll just leave this screenshot by [@arsaboo] of the new picture-elements card and [the Lovelace configuration](https://github.com/arsaboo/homeassistant-config/blob/master/ui-lovelace.yaml#L15-L158):
+We don't have time to go through all the changes in this release, but [@ciotlosm] has been keeping a very detailed changelog. I'll just leave this screenshot by [@arsaboo] of the new picture-elements card and [the Lovelace configuration](https://github.com/arsaboo/homeassistant-config/blob/master/ui-lovelace.yaml#L15-L158):
 
 <p class='img'>
 <img src='/images/blog/2018-07-0.73/lovelace-elements.png' alt='Screenshot of a floorplan with sensor info and light/camera controls overlayed.'>
diff --git a/source/_posts/2018-07-21-release-74.markdown b/source/_posts/2018-07-21-release-74.markdown
index bc2bd6baeae..6fa4184516e 100644
--- a/source/_posts/2018-07-21-release-74.markdown
+++ b/source/_posts/2018-07-21-release-74.markdown
@@ -32,7 +32,7 @@ To try it out today, [read these instructions](https://developers.home-assistant
 
 We keep seeing [great examples](https://twitter.com/home_assistant/status/1019579208622845953) of UIs built with Lovelace. Follow us on social media ([FB](https://www.facebook.com/homeassistantio/?ref=bookmarks), [Twitter](https://twitter.com/home_assistant)) where we will keep sharing great examples.
 
-For the Lovelace changes in this release, check out the [changelog](/lovelace/changelog/). To help our development and design teams, we've also introduced a [Lovelace card gallery](https://www.awesome-ha.com/).
+To help our development and design teams, we've also introduced a [Lovelace card gallery](https://www.awesome-ha.com/).
 
 Thanks to [@c727], [@jeradM] and [@ciotlosm] for leading this effort ❤️
 
diff --git a/source/_posts/2018-10-12-release-80.markdown b/source/_posts/2018-10-12-release-80.markdown
index 4383741f7f2..333b0e7e0de 100644
--- a/source/_posts/2018-10-12-release-80.markdown
+++ b/source/_posts/2018-10-12-release-80.markdown
@@ -15,8 +15,8 @@ October 12, 2018. 12 days into Hacktoberfest and it's been busier than ever on t
 
 Alright, new release, we got some cool stuff! Let's start with our [Lovelace UI](/lovelace). We have integrated into Lovelace UI some of the custom cards that our amazing community have built, making them easily accessible to all users. The cards are [Gauge][ll-gauge] and [Sensor][ll-sensor]:
 
-[ll-gauge]: /lovelace/gauge/
-[ll-sensor]: /lovelace/sensor/
+[ll-gauge]: /dashboards/gauge/
+[ll-sensor]: /dashboards/sensor/
 
 <img src='/images/blog/2018-10-release-80/lovelace-glance-sensor.png' alt='Screenshot of new Gauge and Sensor cards' style='border: 0;box-shadow: none;'>
 
diff --git a/source/_posts/2018-10-29-release-81.markdown b/source/_posts/2018-10-29-release-81.markdown
index b69e8fc3758..edcf6d16646 100644
--- a/source/_posts/2018-10-29-release-81.markdown
+++ b/source/_posts/2018-10-29-release-81.markdown
@@ -18,7 +18,7 @@ To go with the configuration entry support, MQTT also now also integrates with t
 Lovelace has another three new cards, the alarm panel, the button card, and the thermostat card:
 
 <p class='img'>
-  <img src='/images/lovelace/lovelace_thermostat_card.gif' alt='Screenshot of the thermostat card'>
+  <img src='/images/dashboards/lovelace_thermostat_card.gif' alt='Screenshot of the thermostat card'>
   Screenshot of the thermostat card.
 </p>
 
diff --git a/source/_posts/2018-12-12-release-84.markdown b/source/_posts/2018-12-12-release-84.markdown
index 96c1938141e..042ad8a851a 100644
--- a/source/_posts/2018-12-12-release-84.markdown
+++ b/source/_posts/2018-12-12-release-84.markdown
@@ -45,9 +45,9 @@ If you are currently testing Lovelace, please read the notes thoroughly as a lot
 
 So if you were using Lovelace before 0.84, you now have two options. Option one is to use the new storage mode and import your existing file. You can do this by opening the Lovelace UI and click on Configure UI, this will prompt you to change to storage mode. This will unlock a new option in the menu called "raw config editor". Open this and paste the content of your `ui-lovelace.yaml` file into it and click save. Note that YAML comments are not persisted and `!include`/`!secret` are not supported if in storage mode.
 
-If you want to continue managing a YAML file, [check here how to enable the YAML mode](/lovelace/yaml-mode/). The file `ui-lovelace.yaml` will now follow the same options as `configuration.yaml`. This means that the Lovelace YAML config is now parsed with YAML 1.1 instead of YAML 1.2. Major change is that you need to make sure that you wrap `on` and `off` with quotes in your configs!
+If you want to continue managing a YAML file, [check here how to enable the YAML mode](/dashboards/yaml-mode/). The file `ui-lovelace.yaml` will now follow the same options as `configuration.yaml`. This means that the Lovelace YAML config is now parsed with YAML 1.1 instead of YAML 1.2. Major change is that you need to make sure that you wrap `on` and `off` with quotes in your configs!
 
-We have also aligned the configuration of all the cards, causing breaking changes. Changes are especially focused around how we define actions for short and long presses. See [the docs](/lovelace/changelog/) for more info.
+We have also aligned the configuration of all the cards, causing breaking changes. Changes are especially focused around how we define actions for short and long presses. See [the docs](/dashboards/changelog/) for more info.
 
 Editor UI is now further processed. You can manage your Lovelace UI without leaving your browser! It is possible to add, edit and delete views. It is possible to add, edit, move and delete cards, including custom cards!
 
diff --git a/source/_posts/2019-01-23-lovelace-released.markdown b/source/_posts/2019-01-23-lovelace-released.markdown
index b5e9618f478..1048534c7aa 100644
--- a/source/_posts/2019-01-23-lovelace-released.markdown
+++ b/source/_posts/2019-01-23-lovelace-released.markdown
@@ -13,7 +13,7 @@ og_image: /images/blog/2019-01-lovelace/demo.png
 
 Today we're happy to announce that our new Lovelace UI, which has been in beta for the last 8 months, is becoming the new default interface of [Home Assistant 0.86](/blog/2019/01/23/release-86/). With Lovelace we're taking a new approach to building user interfaces for Home Assistant. We're no longer storing the look and feel of your UI in your configuration.yaml, requiring restarts for changes. With Lovelace we're keeping the UI concerns in the UI<sup>1</sup>, unlocking a whole new set of features:
 
- - [24 cards](/lovelace/alarm-panel/) to place and configure as you like.
+ - [24 cards](/dashboards/alarm-panel/) to place and configure as you like.
  - UI Editor. A configuration UI to manage your Lovelace UI including live preview when editing cards.
  - Fast. Using a static config allows us to build up the UI once.
  - Customizable.
@@ -30,9 +30,9 @@ In case you're reading this and want to give it a try right now: we've updated [
 
 For a deep dive into all the new features, check out the [latest episode of the Home Assistant podcast](https://hasspodcast.io/ha042/), featuring an interview with [Zack Arnett][@zsarnett] from the Lovelace team.
 
-For an overview of all the different features, check out the [Lovelace documentation](/lovelace/).
+For an overview of all the different features, check out the [Lovelace documentation](/dashboards/).
 
-<sup>1</sup>: If you prefer to write your Lovelace config in YAML, Lovelace also includes an optional [YAML mode](/lovelace/yaml-mode/).
+<sup>1</sup>: If you prefer to write your Dashboard config in YAML, Home Assistant also includes an optional [YAML mode](/dashboards/yaml-mode/).
 
 ## Migrating to Lovelace
 
diff --git a/source/_posts/2019-08-07-release-97.markdown b/source/_posts/2019-08-07-release-97.markdown
index 522c9ded1db..e8a4043da65 100644
--- a/source/_posts/2019-08-07-release-97.markdown
+++ b/source/_posts/2019-08-07-release-97.markdown
@@ -45,7 +45,7 @@ Home Assistant Cast opens a whole new world of possibilities for using Lovelace,
 
 This release contains a couple of notable UI changes:
 
-- [New Cast row available](/lovelace/entities/#cast) in the Lovelace entities card to start Home Assistant Cast.
+- [New Cast row available](/dashboards/entities/#cast) in the Lovelace entities card to start Home Assistant Cast.
 - Improved accessibility for visually impaired users. This is an [ongoing effort](https://github.com/home-assistant/home-assistant-polymer/issues/3267) on making the frontend accessible.
 - Split out `configuration.yaml` actions from the core configuration into a new server control config panel. Thanks [@IcyPalm]
 - Markdown card now has a size + 1, if it has a header defined. Some layouts might be moved around due to this.
diff --git a/source/_posts/2020-02-05-release-105.markdown b/source/_posts/2020-02-05-release-105.markdown
index 9fc3faf5c09..9e18d1b5fb3 100644
--- a/source/_posts/2020-02-05-release-105.markdown
+++ b/source/_posts/2020-02-05-release-105.markdown
@@ -141,7 +141,7 @@ So if you have a light named "Living room lights" that is in the area "Living ro
 - We added many accessibility features to Lovelace; you can navigate almost everything with the tab key.
 We will continue to work on this so that people with disabilities can also enjoy Home Assistant.
 
-For a full list of changes, see the [Lovelace changelog](/lovelace/changelog/).
+For a full list of changes, see the Lovelace changelog.
 
 Even more frontend improvements:
 
diff --git a/source/_posts/2020-03-18-release-107.markdown b/source/_posts/2020-03-18-release-107.markdown
index 2fd39bdbfff..6d4e29abf94 100644
--- a/source/_posts/2020-03-18-release-107.markdown
+++ b/source/_posts/2020-03-18-release-107.markdown
@@ -69,7 +69,7 @@ admin users only.
 
 An unlimited amount of dashboards can be created right from the UI in the new
 Lovelace configuration panel, and YAML dashboards can be set up in
-`configuration.yaml`, see [the documentation](/lovelace/yaml-mode/).
+`configuration.yaml`, see [the documentation](/dashboards/yaml-mode/).
 
 This awesome new feature comes with a deprecation if you use Lovelace in
 manual YAML mode: You need to move the `resources` section from
@@ -176,14 +176,14 @@ Experiencing issues introduced by this release? Please report them in our [issue
 
 - **Input Number** - Adds an entity ID to input_number warning. Passing an out of range value to `input_number.set_value` will now raise a validation error. Incrementing/decrementing an `input_number` will no longer cause warnings. - ([@balloob] - [#32012]) ([input_number docs])
 
-- **History Graph** - The `history_graph` integration has been deprecated in Home Assistant 0.105 and is now removed. This integration was used for the old states UI, which is no longer available. A Lovelace an equivalent is available: [The Lovelace History Graph](/lovelace/history-graph/). ([@frenck] - [#32028])
+- **History Graph** - The `history_graph` integration has been deprecated in Home Assistant 0.105 and is now removed. This integration was used for the old states UI, which is no longer available. A Lovelace an equivalent is available: [The Lovelace History Graph](/dashboards/history-graph/). ([@frenck] - [#32028])
 
 - **Weblink** - The `weblink` integration is was deprecated in 0.105.0 and now removed. This integration only works with the old states UI, which is no longer available. ([@frenck] - [#32024])
 
   With Lovelace, the same can be achieved using:
 
-  - [The Lovelace Markdown card](/lovelace/markdown/)
-  - [The Lovelace Entities card](/lovelace/entities/#weblink)
+  - [The Lovelace Markdown card](/dashboards/markdown/)
+  - [The Lovelace Entities card](/dashboards/entities/#weblink)
 
 - **Environment Canada** - This integration was previously using web scraping for weather alert details. The details attribute has been removed to make it compliant. (ADR-0004) - ([@michaeldavie] - [#32077]) ([environment_canada docs])
 
diff --git a/source/_posts/2020-05-20-release-110.markdown b/source/_posts/2020-05-20-release-110.markdown
index 18d419bebb3..229d8087efb 100644
--- a/source/_posts/2020-05-20-release-110.markdown
+++ b/source/_posts/2020-05-20-release-110.markdown
@@ -148,7 +148,7 @@ You can also set the attribute you want to show as the secondary information.
 Screenshot of the updated weather card.
 </p>
 
-Check the [documentation](/lovelace/weather-forecast/) for more information.
+Check the [documentation](/dashboards/weather-forecast/) for more information.
 
 ## Internal & External URLs
 
diff --git a/source/_posts/2020-08-05-mobile-apps-new-features.markdown b/source/_posts/2020-08-05-mobile-apps-new-features.markdown
index 06d5001449c..4d21b706fec 100644
--- a/source/_posts/2020-08-05-mobile-apps-new-features.markdown
+++ b/source/_posts/2020-08-05-mobile-apps-new-features.markdown
@@ -93,7 +93,7 @@ We have also been hard at working making improvements in other areas of the app:
 
 * There are now 2 [widgets](https://companion.home-assistant.io/docs/integrations/android-widgets) that you can set up, with Entity State being the latest addition. The Entity State widget will display the state and any attribute of the selected entity. It will update once every 30 minutes or when tapped. The Service Call widget was also enhanced to allow you to select from a list of valid and available services along with the ability to add additional data fields that the service may require.
 * In App Configuration the Home Network WiFi SSID option now allows the user to select multiple SSIDs.
-* A Cookie Manager was added to our WebView that will allow you to save cookies from sites that you may use in the [webpage card](/lovelace/iframe/).
+* A Cookie Manager was added to our WebView that will allow you to save cookies from sites that you may use in the [webpage card](/dashboards/iframe/).
 * More descriptive SSL error messages were added to help users resolve local issues they may encounter while setting up the app.
 * Device ID is now sent with the event data for actionable notifications.
 
diff --git a/source/_posts/2021-04-09-android-april-2021-release.markdown b/source/_posts/2021-04-09-android-april-2021-release.markdown
index ab17c30f09c..7a111e1fcc4 100644
--- a/source/_posts/2021-04-09-android-april-2021-release.markdown
+++ b/source/_posts/2021-04-09-android-april-2021-release.markdown
@@ -37,7 +37,7 @@ Screenshot of Sensor Search & Filter.
 
 ## Shortcuts
 
-Sometimes when you open the app you may already know exactly where you want to go. You may find yourself on the same view often to see your cameras or give the nursery a quick look to make sure things are ok. You may even want to quickly see the history of an entity like when the door was last opened. In this release, we have introduced [Android Shortcuts](https://developer.android.com/guide/topics/ui/shortcuts) which will let you get to anywhere in the Home Assistant frontend quickly, directly from your home screen. Shortcuts will look like a separate app on the home screen allowing you to make them easily accessible and even place them into a folder for better organization. You can navigate to any Lovelace [view or dashboard](/lovelace/dashboards-and-views/) including other pages like the [Shopping List](/integrations/shopping_list/). You can also navigate to any entity directly to get more information like the history or see the graph.
+Sometimes when you open the app you may already know exactly where you want to go. You may find yourself on the same view often to see your cameras or give the nursery a quick look to make sure things are ok. You may even want to quickly see the history of an entity like when the door was last opened. In this release, we have introduced [Android Shortcuts](https://developer.android.com/guide/topics/ui/shortcuts) which will let you get to anywhere in the Home Assistant frontend quickly, directly from your home screen. Shortcuts will look like a separate app on the home screen allowing you to make them easily accessible and even place them into a folder for better organization. You can navigate to any Lovelace [view or dashboard](/dashboards/dashboards-and-views/) including other pages like the [Shopping List](/integrations/shopping_list/). You can also navigate to any entity directly to get more information like the history or see the graph.
 
 There are a few different shortcut types and in the nature of Home Assistant, we have opted not to add static shortcuts because they are static! We support dynamic shortcuts which will show up under the app long-press menu. Once you create a shortcut, you will be able to drag it onto your home screen. There is also support for pinned shortcuts that can be added automatically to your home screen without needing to drag the icon, given your device and launcher support pinned shortcuts. Check out the [documentation](https://companion.home-assistant.io/docs/integrations/android-shortcuts) for more details including known limitations.
 
diff --git a/source/_posts/2021-08-04-home-energy-management.markdown b/source/_posts/2021-08-04-home-energy-management.markdown
index 20d7c558f46..d1d3a0ef9a8 100644
--- a/source/_posts/2021-08-04-home-energy-management.markdown
+++ b/source/_posts/2021-08-04-home-energy-management.markdown
@@ -110,9 +110,9 @@ If you're interested in helping out, don't hesitate to stop by the new #devs_ene
 
 ### New possibilities for advanced users
 
-Every home is different and so are the needs of individual users. The energy management feature in Home Assistant is created with existing Home Assistant building blocks: Lovelace & Data storage. This means that our advanced users can choose to build up their own dashboards and use [the pieces from the energy dashboard](/lovelace/energy/) that they like.
+Every home is different and so are the needs of individual users. The energy management feature in Home Assistant is created with existing Home Assistant building blocks: Lovelace & Data storage. This means that our advanced users can choose to build up their own dashboards and use [the pieces from the energy dashboard](/dashboards/energy/) that they like.
 
-On top of that, advanced users will have access to the new [long-term statistics](/lovelace/statistics-graph/) that have been added to Home Assistant. This data allows you to easily monitor most sensor data over long periods of time, not just energy data.
+On top of that, advanced users will have access to the new [long-term statistics](/dashboards/statistics-graph/) that have been added to Home Assistant. This data allows you to easily monitor most sensor data over long periods of time, not just energy data.
 
 ### Thank you community
 
diff --git a/source/_posts/2021-08-04-release-20218.markdown b/source/_posts/2021-08-04-release-20218.markdown
index 5eb0fc0d35f..e7dfcb3cdc7 100644
--- a/source/_posts/2021-08-04-release-20218.markdown
+++ b/source/_posts/2021-08-04-release-20218.markdown
@@ -121,7 +121,7 @@ Every hour, we calculate things like mean, min/max values, or the difference
 created that hour and store just that result in our long-term statistics.
 
 These statistics is what partly powers the new Energy dashboard, however,
-they can be used for anything else: Introducing the Lovelace [statistics graph card](/lovelace/statistics-graph/).
+they can be used for anything else: Introducing the Lovelace [statistics graph card](/dashboards/statistics-graph/).
 
 <p class='img'>
 <img src='/images/blog/2021-08/statistics-graph.png' alt='Screenshot of the new Lovelace statistics graph card'>
@@ -170,7 +170,7 @@ Screenshot of the Gauge card in needle mode with severity configured.
 </p>
 
 These settings are available straight from the Lovelace UI editor; More
-information and examples can be found in the [Gauge card documentation](/lovelace/gauge/).
+information and examples can be found in the [Gauge card documentation](/dashboards/gauge/).
 
 ## Currency core setting
 
diff --git a/source/_posts/2022-03-02-release-20223.markdown b/source/_posts/2022-03-02-release-20223.markdown
index 5761f822938..21bcd9a37fd 100644
--- a/source/_posts/2022-03-02-release-20223.markdown
+++ b/source/_posts/2022-03-02-release-20223.markdown
@@ -205,7 +205,7 @@ Click the My button below to test it out on your Home Assistant instance:
 {% my developer_template badge %}
 
 [@kubawolanin]: https://github.com/kubawolanin
-[Lovelace cards]: /lovelace/cards
+[Lovelace cards]: /dashboards/cards
 [Tim Cowell]: https://github.com/tgcowell
 [Waves]: https://github.com/tgcowell/waves
 
diff --git a/source/_redirects b/source/_redirects
index 1e93fff3919..b05d8bc89fa 100644
--- a/source/_redirects
+++ b/source/_redirects
@@ -1060,7 +1060,7 @@
 /integrations/cover.modbus /integrations/modbus
 /integrations/fan.xiaomi_miio /integrations/xiaomi_miio
 /integrations/light.xiaomi_miio /integrations/xiaomi_miio
-/integrations/lovelace /lovelace
+/integrations/lovelace /dashboards
 /integrations/remote.xiaomi_miio /integrations/xiaomi_miio
 /integrations/sensor.websocket_api /integrations/websocket_api
 /integrations/sensor.modbus /integrations/modbus
@@ -2182,11 +2182,14 @@
 /tag/* /tag 200
 
 # Lovelace documentation
-/lovelace/entity-button /lovelace/button
-/lovelace/views /lovelace/dashboards-and-views
-/lovelace/yaml-mode /lovelace/dashboards-and-views
-/lovelace/calendar-card /lovelace/calendar
-/integrations/lovelace /lovelace
+/lovelace/entity-button /dashboards/button
+/lovelace/views /dashboards/dashboards-and-views
+/lovelace/yaml-mode /dashboards/dashboards-and-views
+/lovelace/calendar-card /dashboards/calendar
+/integrations/lovelace /dashboards
+/lovelace/* /dashboards/:splat
+/images/lovelace/* /images/dashboards/:splat
+
 
 # Removed documentation
 /docs/installation /getting-started
diff --git a/source/lovelace/actions.markdown b/source/dashboards/actions.markdown
similarity index 95%
rename from source/lovelace/actions.markdown
rename to source/dashboards/actions.markdown
index 099e5f8477d..82ed55aa709 100644
--- a/source/lovelace/actions.markdown
+++ b/source/dashboards/actions.markdown
@@ -7,14 +7,14 @@ Some cards have support for tap actions. These actions define what will happen w
 
 Actions can be enabled on:
 
-- [Button](/lovelace/button/)
-- [Entities](/lovelace/entities/)
-- [Glance](/lovelace/glance/)
-- [Light](/lovelace/light/)
-- [Picture](/lovelace/picture/)
-- [Picture Element](/lovelace/picture-elements/)
-- [Picture Entity](/lovelace/picture-entity/)
-- [Picture Glance](/lovelace/picture-glance/)
+- [Button](/dashboards/button/)
+- [Entities](/dashboards/entities/)
+- [Glance](/dashboards/glance/)
+- [Light](/dashboards/light/)
+- [Picture](/dashboards/picture/)
+- [Picture Element](/dashboards/picture-elements/)
+- [Picture Entity](/dashboards/picture-entity/)
+- [Picture Glance](/dashboards/picture-glance/)
 
 ## Tap-Action
 
diff --git a/source/lovelace/badges.markdown b/source/dashboards/badges.markdown
similarity index 98%
rename from source/lovelace/badges.markdown
rename to source/dashboards/badges.markdown
index e101fabb8a0..04ed51f9025 100644
--- a/source/lovelace/badges.markdown
+++ b/source/dashboards/badges.markdown
@@ -7,7 +7,7 @@ Badges are widgets that sit at the top of a panel, above all the cards.
 
 ## State Label Badge
 
-The State Label badge allows you to display a state badge. This badge supports [actions](/lovelace/actions/).
+The State Label badge allows you to display a state badge. This badge supports [actions](/dashboards/actions/).
 
 ```yaml
 type: state-label
diff --git a/source/lovelace/cards.markdown b/source/dashboards/cards.markdown
similarity index 100%
rename from source/lovelace/cards.markdown
rename to source/dashboards/cards.markdown
diff --git a/source/lovelace/dashboards.markdown b/source/dashboards/dashboards.markdown
similarity index 97%
rename from source/lovelace/dashboards.markdown
rename to source/dashboards/dashboards.markdown
index 237697c30d8..411472ca27f 100644
--- a/source/lovelace/dashboards.markdown
+++ b/source/dashboards/dashboards.markdown
@@ -1,6 +1,6 @@
 ---
-title: "Dashboards"
-description: "A powerful and configurable interface for Home Assistant."
+title: "Multiple Dashboards"
+description: "Multiple powerful and configurable dashboards in Home Assistant."
 ---
 
 You can define multiple dashboards in Home Assistant. Each dashboard can be added to the sidebar. This makes it possible to create separate control dashboards for each individual part of your house.
@@ -70,10 +70,10 @@ lovelace:
       title: YAML
       icon: mdi:script
       show_in_sidebar: true
-      filename: lovelace.yaml
+      filename: dashboards.yaml
 ```
 
-{% configuration Lovelace %}
+{% configuration dashboards %}
 mode:
   required: true
   description: "In what mode should the main dashboard be, `yaml` or `storage` (UI managed)."
diff --git a/source/lovelace/header-footer.markdown b/source/dashboards/header-footer.markdown
similarity index 84%
rename from source/lovelace/header-footer.markdown
rename to source/dashboards/header-footer.markdown
index 9785f832be0..36c3abe675e 100644
--- a/source/lovelace/header-footer.markdown
+++ b/source/dashboards/header-footer.markdown
@@ -5,7 +5,7 @@ description: "Decorate your dashboard cards with header and footer widgets."
 
 Some dashboard cards have support for header and footer widgets. These widgets fill up the whole available space in a card.
 
-<p class='img'><img src='/images/lovelace/header-footer/screenshot-picture-buttons.png' alt="Screenshot of an entities card with a picture header.">
+<p class='img'><img src='/images/dashboards/header-footer/screenshot-picture-buttons.png' alt="Screenshot of an entities card with a picture header.">
 Screenshot of an entities card with a picture header and buttons footer.
 </p>
 
@@ -16,7 +16,7 @@ Widget to show a picture as a header or a footer. A picture can have touch actio
 ```yaml
 header:
   type: picture
-  image: "https://www.home-assistant.io/images/lovelace/header-footer/balloons-header.png"
+  image: "https://www.home-assistant.io/images/dashboards/header-footer/balloons-header.png"
 ```
 
 {% configuration header-footer %}
@@ -30,15 +30,15 @@ image:
   type: string
 tap_action:
   required: false
-  description: Action taken on card tap. See [action documentation](/lovelace/actions/#tap-action).
+  description: Action taken on card tap. See [action documentation](/dashboards/actions/#tap-action).
   type: map
 hold_action:
   required: false
-  description: Action to take on tap-and-hold. See [action documentation](/lovelace/actions/#hold-action).
+  description: Action to take on tap-and-hold. See [action documentation](/dashboards/actions/#hold-action).
   type: map
 double_tap_action:
   required: false
-  description: Action to take on double tap. See [action documentation](/lovelace/actions/#double-tap-action).
+  description: Action to take on double tap. See [action documentation](/dashboards/actions/#double-tap-action).
   type: map
 {% endconfiguration %}
 
@@ -85,7 +85,7 @@ entities:
 
 Widget to show an entity in the sensor domain as a graph in the header or footer.
 
-<p class='img'><img src='/images/lovelace/header-footer/graph.png' alt="Screenshot of an entities card with a graph footer.">
+<p class='img'><img src='/images/dashboards/header-footer/graph.png' alt="Screenshot of an entities card with a graph footer.">
 Screenshot of an entities card with a graph footer.
 </p>
 
diff --git a/source/lovelace/index.markdown b/source/dashboards/index.markdown
similarity index 87%
rename from source/lovelace/index.markdown
rename to source/dashboards/index.markdown
index f7d94b61d0d..63526f9f56f 100644
--- a/source/lovelace/index.markdown
+++ b/source/dashboards/index.markdown
@@ -1,9 +1,9 @@
 ---
-title: "Dashboard"
-description: "A powerful and configurable dashboard for Home Assistant."
+title: "Dashboards"
+description: "Powerful and configurable dashboards for Home Assistant."
 ---
 
-The Home Assistant dashboard is a fast, customizable and powerful way for users to manage their home using their mobiles and desktops.
+Home Assistant dashboards are a fast, customizable and powerful way for users to manage their home using their mobiles and desktops.
 
 - 29 different cards to place and configure as you like.
 - Dashboard Editor: Allows you to manage your dashboard by including a live preview when editing cards.
diff --git a/source/lovelace/views.markdown b/source/dashboards/views.markdown
similarity index 97%
rename from source/lovelace/views.markdown
rename to source/dashboards/views.markdown
index f3cad05230c..9a54d1d8d39 100644
--- a/source/lovelace/views.markdown
+++ b/source/dashboards/views.markdown
@@ -10,7 +10,7 @@ You can add a view to your user interface, by clicking the menu (three dots at t
 Click the `+` button in the top menu bar.
 
 <p class="img">
-  <img src="/images/lovelace/lovelace_views.png" alt="Views toolbar">
+  <img src="/images/dashboards/lovelace_views.png" alt="Views toolbar">
   Use titles and icons to describe the content of views.
 </p>
 
@@ -86,7 +86,7 @@ user:
 
 ## Type
 
-You can change the layout of a view by using a different view type. The default is [`masonry`](/lovelace/masonry).
+You can change the layout of a view by using a different view type. The default is [`masonry`](/dashboards/masonry).
 
 #### Example
 
diff --git a/source/docs/index.markdown b/source/docs/index.markdown
index 8ccc3fbfa86..e97d2950b09 100644
--- a/source/docs/index.markdown
+++ b/source/docs/index.markdown
@@ -25,11 +25,11 @@ The documentation covers beginner to advanced topics around the installation, se
     </div>
     <div class='title'>MQTT</div>
   </a>
-  <a class='option-card' href='/lovelace/'>
+  <a class='option-card' href='/dashboards/'>
     <div class='img-container'>
       <img src='/images/supported_brands/view-dashboard.png' />
     </div>
-    <div class='title'>User Interface</div>
+    <div class='title'>Dashboards</div>
   </a>
   <a class='option-card' href='https://companion.home-assistant.io/'>
     <div class='img-container'>
diff --git a/source/images/lovelace/energy/carbon-consumed-gauge.png b/source/images/dashboards/energy/carbon-consumed-gauge.png
similarity index 100%
rename from source/images/lovelace/energy/carbon-consumed-gauge.png
rename to source/images/dashboards/energy/carbon-consumed-gauge.png
diff --git a/source/images/lovelace/energy/date-selection.png b/source/images/dashboards/energy/date-selection.png
similarity index 100%
rename from source/images/lovelace/energy/date-selection.png
rename to source/images/dashboards/energy/date-selection.png
diff --git a/source/images/lovelace/energy/devices-graph.png b/source/images/dashboards/energy/devices-graph.png
similarity index 100%
rename from source/images/lovelace/energy/devices-graph.png
rename to source/images/dashboards/energy/devices-graph.png
diff --git a/source/images/lovelace/energy/distribution.png b/source/images/dashboards/energy/distribution.png
similarity index 100%
rename from source/images/lovelace/energy/distribution.png
rename to source/images/dashboards/energy/distribution.png
diff --git a/source/images/lovelace/energy/gas-graph.png b/source/images/dashboards/energy/gas-graph.png
similarity index 100%
rename from source/images/lovelace/energy/gas-graph.png
rename to source/images/dashboards/energy/gas-graph.png
diff --git a/source/images/lovelace/energy/grid-neutrality-gauge.png b/source/images/dashboards/energy/grid-neutrality-gauge.png
similarity index 100%
rename from source/images/lovelace/energy/grid-neutrality-gauge.png
rename to source/images/dashboards/energy/grid-neutrality-gauge.png
diff --git a/source/images/lovelace/energy/solar-consumed-gauge.png b/source/images/dashboards/energy/solar-consumed-gauge.png
similarity index 100%
rename from source/images/lovelace/energy/solar-consumed-gauge.png
rename to source/images/dashboards/energy/solar-consumed-gauge.png
diff --git a/source/images/lovelace/energy/solar-graph.png b/source/images/dashboards/energy/solar-graph.png
similarity index 100%
rename from source/images/lovelace/energy/solar-graph.png
rename to source/images/dashboards/energy/solar-graph.png
diff --git a/source/images/lovelace/energy/sources-table.png b/source/images/dashboards/energy/sources-table.png
similarity index 100%
rename from source/images/lovelace/energy/sources-table.png
rename to source/images/dashboards/energy/sources-table.png
diff --git a/source/images/lovelace/energy/usage-graph.png b/source/images/dashboards/energy/usage-graph.png
similarity index 100%
rename from source/images/lovelace/energy/usage-graph.png
rename to source/images/dashboards/energy/usage-graph.png
diff --git a/source/images/lovelace/header-footer/balloons-header.png b/source/images/dashboards/header-footer/balloons-header.png
similarity index 100%
rename from source/images/lovelace/header-footer/balloons-header.png
rename to source/images/dashboards/header-footer/balloons-header.png
diff --git a/source/images/lovelace/header-footer/graph.png b/source/images/dashboards/header-footer/graph.png
similarity index 100%
rename from source/images/lovelace/header-footer/graph.png
rename to source/images/dashboards/header-footer/graph.png
diff --git a/source/images/lovelace/header-footer/screenshot-picture-buttons.png b/source/images/dashboards/header-footer/screenshot-picture-buttons.png
similarity index 100%
rename from source/images/lovelace/header-footer/screenshot-picture-buttons.png
rename to source/images/dashboards/header-footer/screenshot-picture-buttons.png
diff --git a/source/images/lovelace/lovelace-ui-comparison.png b/source/images/dashboards/lovelace-ui-comparison.png
similarity index 100%
rename from source/images/lovelace/lovelace-ui-comparison.png
rename to source/images/dashboards/lovelace-ui-comparison.png
diff --git a/source/images/lovelace/lovelace_alarm_panel_card.gif b/source/images/dashboards/lovelace_alarm_panel_card.gif
similarity index 100%
rename from source/images/lovelace/lovelace_alarm_panel_card.gif
rename to source/images/dashboards/lovelace_alarm_panel_card.gif
diff --git a/source/images/lovelace/lovelace_alarm_panel_title_card.gif b/source/images/dashboards/lovelace_alarm_panel_title_card.gif
similarity index 100%
rename from source/images/lovelace/lovelace_alarm_panel_title_card.gif
rename to source/images/dashboards/lovelace_alarm_panel_title_card.gif
diff --git a/source/images/lovelace/lovelace_calendar_card.png b/source/images/dashboards/lovelace_calendar_card.png
similarity index 100%
rename from source/images/lovelace/lovelace_calendar_card.png
rename to source/images/dashboards/lovelace_calendar_card.png
diff --git a/source/images/lovelace/lovelace_entity_button_card.png b/source/images/dashboards/lovelace_entity_button_card.png
similarity index 100%
rename from source/images/lovelace/lovelace_entity_button_card.png
rename to source/images/dashboards/lovelace_entity_button_card.png
diff --git a/source/images/lovelace/lovelace_entity_button_complex_card.png b/source/images/dashboards/lovelace_entity_button_complex_card.png
similarity index 100%
rename from source/images/lovelace/lovelace_entity_button_complex_card.png
rename to source/images/dashboards/lovelace_entity_button_complex_card.png
diff --git a/source/images/lovelace/lovelace_entity_card.png b/source/images/dashboards/lovelace_entity_card.png
similarity index 100%
rename from source/images/lovelace/lovelace_entity_card.png
rename to source/images/dashboards/lovelace_entity_card.png
diff --git a/source/images/lovelace/lovelace_entity_filter.png b/source/images/dashboards/lovelace_entity_filter.png
similarity index 100%
rename from source/images/lovelace/lovelace_entity_filter.png
rename to source/images/dashboards/lovelace_entity_filter.png
diff --git a/source/images/lovelace/lovelace_entity_filter_glance.png b/source/images/dashboards/lovelace_entity_filter_glance.png
similarity index 100%
rename from source/images/lovelace/lovelace_entity_filter_glance.png
rename to source/images/dashboards/lovelace_entity_filter_glance.png
diff --git a/source/images/lovelace/lovelace_entity_row_buttons.jpg b/source/images/dashboards/lovelace_entity_row_buttons.jpg
similarity index 100%
rename from source/images/lovelace/lovelace_entity_row_buttons.jpg
rename to source/images/dashboards/lovelace_entity_row_buttons.jpg
diff --git a/source/images/lovelace/lovelace_entity_row_special.jpg b/source/images/dashboards/lovelace_entity_row_special.jpg
similarity index 100%
rename from source/images/lovelace/lovelace_entity_row_special.jpg
rename to source/images/dashboards/lovelace_entity_row_special.jpg
diff --git a/source/images/lovelace/lovelace_gauge_card.gif b/source/images/dashboards/lovelace_gauge_card.gif
similarity index 100%
rename from source/images/lovelace/lovelace_gauge_card.gif
rename to source/images/dashboards/lovelace_gauge_card.gif
diff --git a/source/images/lovelace/lovelace_gauge_needle_card.png b/source/images/dashboards/lovelace_gauge_needle_card.png
similarity index 100%
rename from source/images/lovelace/lovelace_gauge_needle_card.png
rename to source/images/dashboards/lovelace_gauge_needle_card.png
diff --git a/source/images/lovelace/lovelace_glance_card.png b/source/images/dashboards/lovelace_glance_card.png
similarity index 100%
rename from source/images/lovelace/lovelace_glance_card.png
rename to source/images/dashboards/lovelace_glance_card.png
diff --git a/source/images/lovelace/lovelace_grid.png b/source/images/dashboards/lovelace_grid.png
similarity index 100%
rename from source/images/lovelace/lovelace_grid.png
rename to source/images/dashboards/lovelace_grid.png
diff --git a/source/images/lovelace/lovelace_history_graph.png b/source/images/dashboards/lovelace_history_graph.png
similarity index 100%
rename from source/images/lovelace/lovelace_history_graph.png
rename to source/images/dashboards/lovelace_history_graph.png
diff --git a/source/images/lovelace/lovelace_history_graph_lines.png b/source/images/dashboards/lovelace_history_graph_lines.png
similarity index 100%
rename from source/images/lovelace/lovelace_history_graph_lines.png
rename to source/images/dashboards/lovelace_history_graph_lines.png
diff --git a/source/images/lovelace/lovelace_horizontal_stack.PNG b/source/images/dashboards/lovelace_horizontal_stack.PNG
similarity index 100%
rename from source/images/lovelace/lovelace_horizontal_stack.PNG
rename to source/images/dashboards/lovelace_horizontal_stack.PNG
diff --git a/source/images/lovelace/lovelace_humidifier_card.png b/source/images/dashboards/lovelace_humidifier_card.png
similarity index 100%
rename from source/images/lovelace/lovelace_humidifier_card.png
rename to source/images/dashboards/lovelace_humidifier_card.png
diff --git a/source/images/lovelace/lovelace_iframe.png b/source/images/dashboards/lovelace_iframe.png
similarity index 100%
rename from source/images/lovelace/lovelace_iframe.png
rename to source/images/dashboards/lovelace_iframe.png
diff --git a/source/images/lovelace/lovelace_light_card.png b/source/images/dashboards/lovelace_light_card.png
similarity index 100%
rename from source/images/lovelace/lovelace_light_card.png
rename to source/images/dashboards/lovelace_light_card.png
diff --git a/source/images/lovelace/lovelace_light_complex_card.png b/source/images/dashboards/lovelace_light_complex_card.png
similarity index 100%
rename from source/images/lovelace/lovelace_light_complex_card.png
rename to source/images/dashboards/lovelace_light_complex_card.png
diff --git a/source/images/lovelace/lovelace_logbook.png b/source/images/dashboards/lovelace_logbook.png
similarity index 100%
rename from source/images/lovelace/lovelace_logbook.png
rename to source/images/dashboards/lovelace_logbook.png
diff --git a/source/images/lovelace/lovelace_map_card.png b/source/images/dashboards/lovelace_map_card.png
similarity index 100%
rename from source/images/lovelace/lovelace_map_card.png
rename to source/images/dashboards/lovelace_map_card.png
diff --git a/source/images/lovelace/lovelace_markdown.png b/source/images/dashboards/lovelace_markdown.png
similarity index 100%
rename from source/images/lovelace/lovelace_markdown.png
rename to source/images/dashboards/lovelace_markdown.png
diff --git a/source/images/lovelace/lovelace_mediaplayer.png b/source/images/dashboards/lovelace_mediaplayer.png
similarity index 100%
rename from source/images/lovelace/lovelace_mediaplayer.png
rename to source/images/dashboards/lovelace_mediaplayer.png
diff --git a/source/images/lovelace/lovelace_picture.png b/source/images/dashboards/lovelace_picture.png
similarity index 100%
rename from source/images/lovelace/lovelace_picture.png
rename to source/images/dashboards/lovelace_picture.png
diff --git a/source/images/lovelace/lovelace_picture_elements.gif b/source/images/dashboards/lovelace_picture_elements.gif
similarity index 100%
rename from source/images/lovelace/lovelace_picture_elements.gif
rename to source/images/dashboards/lovelace_picture_elements.gif
diff --git a/source/images/lovelace/lovelace_picture_entity.gif b/source/images/dashboards/lovelace_picture_entity.gif
similarity index 100%
rename from source/images/lovelace/lovelace_picture_entity.gif
rename to source/images/dashboards/lovelace_picture_entity.gif
diff --git a/source/images/lovelace/lovelace_picture_glance.gif b/source/images/dashboards/lovelace_picture_glance.gif
similarity index 100%
rename from source/images/lovelace/lovelace_picture_glance.gif
rename to source/images/dashboards/lovelace_picture_glance.gif
diff --git a/source/images/lovelace/lovelace_plant_card.png b/source/images/dashboards/lovelace_plant_card.png
similarity index 100%
rename from source/images/lovelace/lovelace_plant_card.png
rename to source/images/dashboards/lovelace_plant_card.png
diff --git a/source/images/lovelace/lovelace_sensor.png b/source/images/dashboards/lovelace_sensor.png
similarity index 100%
rename from source/images/lovelace/lovelace_sensor.png
rename to source/images/dashboards/lovelace_sensor.png
diff --git a/source/images/lovelace/lovelace_shopping_list_card.gif b/source/images/dashboards/lovelace_shopping_list_card.gif
similarity index 100%
rename from source/images/lovelace/lovelace_shopping_list_card.gif
rename to source/images/dashboards/lovelace_shopping_list_card.gif
diff --git a/source/images/lovelace/lovelace_statistics_graph_bar.png b/source/images/dashboards/lovelace_statistics_graph_bar.png
similarity index 100%
rename from source/images/lovelace/lovelace_statistics_graph_bar.png
rename to source/images/dashboards/lovelace_statistics_graph_bar.png
diff --git a/source/images/lovelace/lovelace_statistics_graph_line.png b/source/images/dashboards/lovelace_statistics_graph_line.png
similarity index 100%
rename from source/images/lovelace/lovelace_statistics_graph_line.png
rename to source/images/dashboards/lovelace_statistics_graph_line.png
diff --git a/source/images/lovelace/lovelace_thermostat_card.gif b/source/images/dashboards/lovelace_thermostat_card.gif
similarity index 100%
rename from source/images/lovelace/lovelace_thermostat_card.gif
rename to source/images/dashboards/lovelace_thermostat_card.gif
diff --git a/source/images/lovelace/lovelace_vertical-horizontal-stack.png b/source/images/dashboards/lovelace_vertical-horizontal-stack.png
similarity index 100%
rename from source/images/lovelace/lovelace_vertical-horizontal-stack.png
rename to source/images/dashboards/lovelace_vertical-horizontal-stack.png
diff --git a/source/images/lovelace/lovelace_vertical-stack.png b/source/images/dashboards/lovelace_vertical-stack.png
similarity index 100%
rename from source/images/lovelace/lovelace_vertical-stack.png
rename to source/images/dashboards/lovelace_vertical-stack.png
diff --git a/source/images/lovelace/lovelace_views.png b/source/images/dashboards/lovelace_views.png
similarity index 100%
rename from source/images/lovelace/lovelace_views.png
rename to source/images/dashboards/lovelace_views.png
diff --git a/source/images/lovelace/lovelace_weather.png b/source/images/dashboards/lovelace_weather.png
similarity index 100%
rename from source/images/lovelace/lovelace_weather.png
rename to source/images/dashboards/lovelace_weather.png
diff --git a/source/installation/index.html b/source/installation/index.html
index 008a6ee5169..beff598efe4 100644
--- a/source/installation/index.html
+++ b/source/installation/index.html
@@ -204,7 +204,7 @@ toc: true
         <td>✅</td><td>✅</td><td>✅</td><td>✅</td>
     </tr>
     <tr>
-        <td><a href="/lovelace" target="_blank">Lovelace</a></td>
+        <td><a href="/dashboards" target="_blank">Dashboards</a></td>
         <td>✅</td><td>✅</td><td>✅</td><td>✅</td>
     </tr>
     <tr>