diff --git a/public/badges/areas.svg b/public/badges/areas.svg
index 1dd23ae..87c095e 100644
--- a/public/badges/areas.svg
+++ b/public/badges/areas.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="40" aria-label="Show areas of My Home Assistant" style="border-radius:24px;width:auto" viewBox="0 0 496 96"><rect width="496" height="96" fill="#18BCF2" rx="48"/><path fill="#fff" d="M50.42 60.6c5.46 0 8.54-2.75 8.54-6.93 0-3.12-2.31-5.9-6.36-6.9L49.51 46c-1.74-.44-2.81-1.24-2.81-2.72 0-1.84 1.34-2.95 3.58-2.95 2.18 0 3.66 1.24 4.19 2.75l4.46-1.37c-1.24-3.29-4.02-5.36-8.51-5.36-5.36 0-8.41 2.61-8.41 7.03 0 3.49 2.35 5.7 5.8 6.57l3.04.8c2.08.51 3.32 1.54 3.32 3.02 0 1.71-1.64 2.88-4.02 2.85-2.24-.04-3.75-1.28-4.32-2.82l-4.49 1.34c.67 2.88 4.32 5.46 9.08 5.46m13.13-.4 4.59.03v-9.91h10.85v9.88h4.59V36.75h-4.59v9.35H68.14v-9.35l-4.59-.03Zm36.52.4c6.96 0 11.92-5.02 11.92-12.09 0-7.1-4.96-12.13-12.02-12.13-7.04 0-12 4.99-12 12.13 0 7.07 4.99 12.09 12.1 12.09m0-4.19c-4.36 0-7.41-3.28-7.41-7.9 0-4.66 3.02-7.94 7.31-7.94 4.32 0 7.33 3.28 7.33 7.94 0 4.62-2.98 7.9-7.23 7.9m20.3 3.79h4.79l4.49-16.52 4.42 16.52h4.82l7-23.45h-4.65l-4.73 16.41-4.59-16.41h-4.55l-4.52 16.68-4.76-16.68h-4.66Zm35.37 0h4.86l1.98-5.16h9.71l1.98 5.16h4.86l-9.25-23.45h-4.89Zm8.38-9.21 3.31-8.65 3.32 8.65Zm18.49 9.21h4.59v-8.31h3.52l4.79 8.31h5.19l-5.43-9.11c2.72-1.21 4.49-3.69 4.49-6.77 0-4.45-3.48-7.64-8.44-7.6l-4.66.03h-4.05Zm8.51-19.26c2.28 0 3.88 1.37 3.88 3.38 0 1.98-1.6 3.38-3.65 3.38h-4.15v-6.76Zm13.77 19.26h14.97v-4.19h-10.38v-5.66h8.84v-4.09h-8.84v-5.32h10.25v-4.19h-14.84Zm18.12 0h4.86l1.97-5.16h9.72l1.98 5.16h4.85l-9.24-23.45h-4.89Zm8.38-9.21 3.31-8.65 3.32 8.65Zm26.36 9.61c5.46 0 8.54-2.75 8.54-6.93 0-3.12-2.31-5.9-6.36-6.9l-3.08-.77c-1.75-.44-2.82-1.24-2.82-2.72 0-1.84 1.34-2.95 3.59-2.95 2.17 0 3.65 1.24 4.18 2.75l4.46-1.37c-1.24-3.29-4.02-5.36-8.51-5.36-5.36 0-8.41 2.61-8.41 7.03 0 3.49 2.35 5.7 5.8 6.57l3.05.8c2.07.51 3.31 1.54 3.31 3.02 0 1.71-1.64 2.88-4.02 2.85-2.24-.04-3.75-1.28-4.32-2.82l-4.49 1.34c.67 2.88 4.32 5.46 9.08 5.46m32.5 0c6.96 0 11.92-5.02 11.92-12.09 0-7.1-4.96-12.13-12.03-12.13-7.03 0-11.99 4.99-11.99 12.13 0 7.07 4.99 12.09 12.1 12.09m0-4.19c-4.36 0-7.41-3.28-7.41-7.9 0-4.66 3.02-7.94 7.3-7.94 4.33 0 7.34 3.28 7.34 7.94 0 4.62-2.98 7.9-7.23 7.9m16.31 3.79h4.59v-9.45h8.71v-4.18h-8.71v-5.63h10.45v-4.19h-15.04Z"/><g style="transform:translate(-1px,0)"><rect width="137" height="64" x="344" y="16" fill="#F2F4F9" rx="32"/><path fill="#18BCF2" d="M394.419 37.047V60.5h-4.297V46.797L384.716 60.5h-4.157l-5.343-13.594V60.5h-4.188V37.047h4.188l7.422 18.36 7.484-18.36h4.297m9.365 0 5.344 9.89 5.344-9.89h4.766l-7.969 14.14V60.5h-4.391v-9.312l-8.031-14.141h4.937M457 60c0 1.65-1.35 3-3 3h-24c-1.65 0-3-1.35-3-3v-9c0-1.65.95-3.95 2.12-5.12l10.76-10.76a3 3 0 0 1 4.24 0l10.76 10.76c1.17 1.17 2.12 3.47 2.12 5.12z"/><path fill="#F2F4F9" stroke="#F2F4F9" d="M442 45.5a2 2 0 1 0 0-4 2 2 0 0 0 0 4Z"/><path fill="#F2F4F9" stroke="#F2F4F9" stroke-miterlimit="10" d="M449.5 53.5a2 2 0 1 0 0-4 2 2 0 0 0 0 4ZM434.5 57.5a2 2 0 1 0 0-4 2 2 0 0 0 0 4Z"/><path fill="none" stroke="#F2F4F9" stroke-miterlimit="10" stroke-width="2.25" d="M442 43.48V63l-7.5-7.5M449.5 51.46l-7.41 7.41"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" height="40" aria-label="Show floors and areas of My Home Assistant" style="border-radius:24px;width:auto" viewBox="0 0 724 96"><rect width="724" height="96" fill="#18BCF2" rx="48"/><path fill="#fff" d="M50.42 60.6c5.46 0 8.54-2.75 8.54-6.93 0-3.12-2.31-5.9-6.36-6.9L49.51 46c-1.74-.44-2.81-1.24-2.81-2.72 0-1.84 1.34-2.95 3.58-2.95 2.18 0 3.66 1.24 4.19 2.75l4.46-1.37c-1.24-3.29-4.02-5.36-8.51-5.36-5.36 0-8.41 2.61-8.41 7.03 0 3.49 2.35 5.7 5.8 6.57l3.04.8c2.08.51 3.32 1.54 3.32 3.02 0 1.71-1.64 2.88-4.02 2.85-2.24-.04-3.75-1.28-4.32-2.82l-4.49 1.34c.67 2.88 4.32 5.46 9.08 5.46m13.13-.4 4.59.03v-9.91h10.85v9.88h4.59V36.75h-4.59v9.35H68.14v-9.35l-4.59-.03Zm36.52.4c6.96 0 11.92-5.02 11.92-12.09 0-7.1-4.96-12.13-12.02-12.13-7.04 0-12 4.99-12 12.13 0 7.07 4.99 12.09 12.1 12.09m0-4.19c-4.36 0-7.41-3.28-7.41-7.9 0-4.66 3.02-7.94 7.31-7.94 4.32 0 7.33 3.28 7.33 7.94 0 4.62-2.98 7.9-7.23 7.9m20.3 3.79h4.79l4.49-16.52 4.42 16.52h4.82l7-23.45h-4.65l-4.73 16.41-4.59-16.41h-4.55l-4.52 16.68-4.76-16.68h-4.66Zm37.65 0h4.59v-9.45h8.71v-4.18h-8.71v-5.63h10.45v-4.19h-15.04Zm19.23 0h14.91v-4.19h-10.32V36.75h-4.59Zm28.91.4c6.97 0 11.93-5.02 11.93-12.09 0-7.1-4.96-12.13-12.03-12.13-7.04 0-11.99 4.99-11.99 12.13 0 7.07 4.99 12.09 12.09 12.09m0-4.19c-4.36 0-7.4-3.28-7.4-7.9 0-4.66 3.01-7.94 7.3-7.94 4.32 0 7.34 3.28 7.34 7.94 0 4.62-2.99 7.9-7.24 7.9m27.03 4.19c6.97 0 11.93-5.02 11.93-12.09 0-7.1-4.96-12.13-12.03-12.13-7.03 0-11.99 4.99-11.99 12.13 0 7.07 4.99 12.09 12.09 12.09m0-4.19c-4.35 0-7.4-3.28-7.4-7.9 0-4.66 3.02-7.94 7.3-7.94 4.33 0 7.34 3.28 7.34 7.94 0 4.62-2.98 7.9-7.24 7.9m16.32 3.79h4.59v-8.31h3.52l4.79 8.31h5.19l-5.43-9.11c2.72-1.21 4.49-3.69 4.49-6.77 0-4.45-3.48-7.64-8.44-7.6l-4.66.03h-4.05Zm8.51-19.26c2.28 0 3.88 1.37 3.88 3.38 0 1.98-1.6 3.38-3.65 3.38h-4.15v-6.76Zm21.64 19.66c5.46 0 8.54-2.75 8.54-6.93 0-3.12-2.31-5.9-6.36-6.9l-3.09-.77c-1.74-.44-2.81-1.24-2.81-2.72 0-1.84 1.34-2.95 3.58-2.95 2.18 0 3.66 1.24 4.19 2.75l4.46-1.37c-1.24-3.29-4.02-5.36-8.51-5.36-5.36 0-8.41 2.61-8.41 7.03 0 3.49 2.35 5.7 5.8 6.57l3.04.8c2.08.51 3.32 1.54 3.32 3.02 0 1.71-1.64 2.88-4.02 2.85-2.24-.04-3.75-1.28-4.32-2.82l-4.49 1.34c.67 2.88 4.32 5.46 9.08 5.46m19.5-.4h4.85l1.98-5.16h9.71l1.98 5.16h4.86l-9.25-23.45h-4.89Zm8.37-9.21 3.32-8.65 3.31 8.65Zm18.49 9.21 4.59.03V44.12l11.66 16.08h4.56V36.75h-4.56v15.81l-11.46-15.81h-4.79Zm26.57 0h7.5c7.17 0 12.23-4.86 12.23-11.73 0-6.86-5.06-11.72-12.23-11.72h-7.5Zm7.5-19.16c4.29 0 7.54 3.21 7.54 7.43 0 4.23-3.25 7.44-7.54 7.44h-2.91V41.04Zm22.98 19.16h4.86l1.98-5.16h9.71l1.98 5.16h4.86l-9.25-23.45h-4.89Zm8.38-9.21 3.32-8.65 3.31 8.65Zm18.49 9.21h4.59v-8.31h3.52l4.79 8.31h5.19l-5.43-9.11c2.72-1.21 4.49-3.69 4.49-6.77 0-4.45-3.48-7.64-8.44-7.6l-4.66.03h-4.05Zm8.51-19.26c2.28 0 3.89 1.37 3.89 3.38 0 1.98-1.61 3.38-3.66 3.38h-4.15v-6.76Zm13.77 19.26h14.97v-4.19h-10.38v-5.66h8.84v-4.09h-8.84v-5.32h10.25v-4.19h-14.84Zm18.12 0h4.86l1.98-5.16h9.71l1.98 5.16h4.85l-9.24-23.45h-4.89Zm8.38-9.21 3.31-8.65 3.32 8.65Zm26.36 9.61c5.46 0 8.54-2.75 8.54-6.93 0-3.12-2.31-5.9-6.36-6.9l-3.08-.77c-1.75-.44-2.82-1.24-2.82-2.72 0-1.84 1.34-2.95 3.59-2.95 2.17 0 3.65 1.24 4.18 2.75l4.46-1.37c-1.24-3.29-4.02-5.36-8.51-5.36-5.36 0-8.41 2.61-8.41 7.03 0 3.49 2.35 5.7 5.8 6.57l3.05.8c2.07.51 3.31 1.54 3.31 3.02 0 1.71-1.64 2.88-4.02 2.85-2.24-.04-3.75-1.28-4.32-2.82L476 55.14c.67 2.88 4.32 5.46 9.08 5.46m32.5 0c6.96 0 11.92-5.02 11.92-12.09 0-7.1-4.96-12.13-12.02-12.13-7.04 0-12 4.99-12 12.13 0 7.07 4.99 12.09 12.1 12.09m0-4.19c-4.36 0-7.41-3.28-7.41-7.9 0-4.66 3.02-7.94 7.31-7.94 4.32 0 7.33 3.28 7.33 7.94 0 4.62-2.98 7.9-7.23 7.9m16.31 3.79h4.59v-9.45h8.71v-4.18h-8.71v-5.63h10.45v-4.19h-15.04Z"/><g style="transform:translate(227px,0)"><rect width="137" height="64" x="344" y="16" fill="#F2F4F9" rx="32"/><path fill="#18BCF2" d="M394.419 37.047V60.5h-4.297V46.797L384.716 60.5h-4.157l-5.343-13.594V60.5h-4.188V37.047h4.188l7.422 18.36 7.484-18.36h4.297m9.365 0 5.344 9.89 5.344-9.89h4.766l-7.969 14.14V60.5h-4.391v-9.312l-8.031-14.141h4.937M457 60c0 1.65-1.35 3-3 3h-24c-1.65 0-3-1.35-3-3v-9c0-1.65.95-3.95 2.12-5.12l10.76-10.76a3 3 0 0 1 4.24 0l10.76 10.76c1.17 1.17 2.12 3.47 2.12 5.12z"/><path fill="#F2F4F9" stroke="#F2F4F9" d="M442 45.5a2 2 0 1 0 0-4 2 2 0 0 0 0 4Z"/><path fill="#F2F4F9" stroke="#F2F4F9" stroke-miterlimit="10" d="M449.5 53.5a2 2 0 1 0 0-4 2 2 0 0 0 0 4ZM434.5 57.5a2 2 0 1 0 0-4 2 2 0 0 0 0 4Z"/><path fill="none" stroke="#F2F4F9" stroke-miterlimit="10" stroke-width="2.25" d="M442 43.48V63l-7.5-7.5M449.5 51.46l-7.41 7.41"/></g></svg>
\ No newline at end of file
diff --git a/public/badges/labels.svg b/public/badges/labels.svg
new file mode 100644
index 0000000..e3b4174
--- /dev/null
+++ b/public/badges/labels.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="40" aria-label="Show labels of My Home Assistant" style="border-radius:24px;width:auto" viewBox="0 0 508 96"><rect width="508" height="96" fill="#18BCF2" rx="48"/><path fill="#fff" d="M50.42 60.6c5.46 0 8.54-2.75 8.54-6.93 0-3.12-2.31-5.9-6.36-6.9L49.51 46c-1.74-.44-2.81-1.24-2.81-2.72 0-1.84 1.34-2.95 3.58-2.95 2.18 0 3.66 1.24 4.19 2.75l4.46-1.37c-1.24-3.29-4.02-5.36-8.51-5.36-5.36 0-8.41 2.61-8.41 7.03 0 3.49 2.35 5.7 5.8 6.57l3.04.8c2.08.51 3.32 1.54 3.32 3.02 0 1.71-1.64 2.88-4.02 2.85-2.24-.04-3.75-1.28-4.32-2.82l-4.49 1.34c.67 2.88 4.32 5.46 9.08 5.46m13.13-.4 4.59.03v-9.91h10.85v9.88h4.59V36.75h-4.59v9.35H68.14v-9.35l-4.59-.03Zm36.52.4c6.96 0 11.92-5.02 11.92-12.09 0-7.1-4.96-12.13-12.02-12.13-7.04 0-12 4.99-12 12.13 0 7.07 4.99 12.09 12.1 12.09m0-4.19c-4.36 0-7.41-3.28-7.41-7.9 0-4.66 3.02-7.94 7.31-7.94 4.32 0 7.33 3.28 7.33 7.94 0 4.62-2.98 7.9-7.23 7.9m20.3 3.79h4.79l4.49-16.52 4.42 16.52h4.82l7-23.45h-4.65l-4.73 16.41-4.59-16.41h-4.55l-4.52 16.68-4.76-16.68h-4.66Zm37.65 0h14.91v-4.19h-10.32V36.75h-4.59Zm16.38 0h4.86l1.98-5.16h9.71l1.98 5.16h4.85l-9.24-23.45h-4.89Zm8.38-9.21 3.31-8.65 3.32 8.65Zm18.49 9.21h9.01c4.69 0 7.77-2.41 7.77-6.7 0-2.65-1.24-4.42-3.41-5.53 1.64-1.17 2.61-2.78 2.61-4.55 0-4.43-3.22-6.7-8.04-6.7l-3.45.03h-4.49Zm7.67-19.8c2.21-.03 3.62 1.07 3.62 2.95 0 1.88-1.27 2.95-3.25 2.95h-3.55v-5.9Zm.54 9.65c2.41-.03 3.88 1.17 3.88 3.08 0 1.81-1.34 3.02-3.52 3.02h-4.08v-6.1h.23Zm12.96 10.15h14.98v-4.19h-10.39v-5.66h8.84v-4.09h-8.84v-5.32h10.25v-4.19h-14.84Zm20.4 0h14.91v-4.19h-10.32V36.75h-4.59Zm26.53.4c5.47 0 8.55-2.75 8.55-6.93 0-3.12-2.31-5.9-6.37-6.9l-3.08-.77c-1.74-.44-2.81-1.24-2.81-2.72 0-1.84 1.34-2.95 3.58-2.95 2.18 0 3.65 1.24 4.19 2.75l4.45-1.37c-1.24-3.29-4.02-5.36-8.51-5.36-5.36 0-8.4 2.61-8.4 7.03 0 3.49 2.34 5.7 5.79 6.57l3.05.8c2.08.51 3.32 1.54 3.32 3.02 0 1.71-1.64 2.88-4.02 2.85-2.25-.04-3.76-1.28-4.32-2.82l-4.49 1.34c.67 2.88 4.32 5.46 9.07 5.46m32.5 0c6.97 0 11.93-5.02 11.93-12.09 0-7.1-4.96-12.13-12.03-12.13-7.04 0-11.99 4.99-11.99 12.13 0 7.07 4.99 12.09 12.09 12.09m0-4.19c-4.36 0-7.4-3.28-7.4-7.9 0-4.66 3.01-7.94 7.3-7.94 4.32 0 7.34 3.28 7.34 7.94 0 4.62-2.99 7.9-7.24 7.9m16.31 3.79h4.59v-9.45h8.71v-4.18h-8.71v-5.63h10.46v-4.19h-15.05Z"/><g style="transform:translate(11px,0)"><rect width="137" height="64" x="344" y="16" fill="#F2F4F9" rx="32"/><path fill="#18BCF2" d="M394.419 37.047V60.5h-4.297V46.797L384.716 60.5h-4.157l-5.343-13.594V60.5h-4.188V37.047h4.188l7.422 18.36 7.484-18.36h4.297m9.365 0 5.344 9.89 5.344-9.89h4.766l-7.969 14.14V60.5h-4.391v-9.312l-8.031-14.141h4.937M457 60c0 1.65-1.35 3-3 3h-24c-1.65 0-3-1.35-3-3v-9c0-1.65.95-3.95 2.12-5.12l10.76-10.76a3 3 0 0 1 4.24 0l10.76 10.76c1.17 1.17 2.12 3.47 2.12 5.12z"/><path fill="#F2F4F9" stroke="#F2F4F9" d="M442 45.5a2 2 0 1 0 0-4 2 2 0 0 0 0 4Z"/><path fill="#F2F4F9" stroke="#F2F4F9" stroke-miterlimit="10" d="M449.5 53.5a2 2 0 1 0 0-4 2 2 0 0 0 0 4ZM434.5 57.5a2 2 0 1 0 0-4 2 2 0 0 0 0 4Z"/><path fill="none" stroke="#F2F4F9" stroke-miterlimit="10" stroke-width="2.25" d="M442 43.48V63l-7.5-7.5M449.5 51.46l-7.41 7.41"/></g></svg>
\ No newline at end of file
diff --git a/redirect.json b/redirect.json
index 39ee0e3..a237a7e 100644
--- a/redirect.json
+++ b/redirect.json
@@ -86,13 +86,6 @@
     "description": "manage your analytics preferences",
     "introduced": "2022.5"
   },
-  {
-    "redirect": "areas",
-    "name": "Areas",
-    "badge": "Show areas of",
-    "description": "show your areas",
-    "introduced": "2021.3"
-  },
   {
     "redirect": "automations",
     "badge": "Show automations of",
@@ -253,6 +246,13 @@
     "description": "show your entities",
     "introduced": "2021.3"
   },
+  {
+    "redirect": "areas",
+    "name": "Floors & areas",
+    "badge": "Show floors and areas of",
+    "description": "show your floors and areas",
+    "introduced": "2021.3"
+  },
   {
     "redirect": "general",
     "name": "General settings",
@@ -354,6 +354,13 @@
     "description": "show your integrations",
     "introduced": "2021.3"
   },
+  {
+    "redirect": "labels",
+    "name": "Labels",
+    "badge": "Show labels of",
+    "description": "show your labels",
+    "introduced": "2024.4"
+  },
   {
     "redirect": "logbook",
     "name": "Logbook",