diff --git a/config/devices.yaml b/config/devices.yaml
index 4afb319..1652249 100644
--- a/config/devices.yaml
+++ b/config/devices.yaml
@@ -11,6 +11,7 @@ redis:
   channel: "ui:updates"
 devices:
 - device_id: lampe_semeniere_wohnzimmer
+  name: Semeniere
   type: relay
   cap_version: "relay@1.0.0"
   technology: zigbee2mqtt
@@ -25,6 +26,7 @@ devices:
     model: "AC10691"
     vendor: "OSRAM"
 - device_id: stehlampe_esszimmer_spiegel
+  name: Spiegel
   type: light
   cap_version: "light@1.2.0"
   technology: zigbee2mqtt
@@ -35,6 +37,7 @@ devices:
     state: "zigbee2mqtt/0x001788010d06ea09"
     set: "zigbee2mqtt/0x001788010d06ea09/set"
 - device_id: stehlampe_esszimmer_schrank
+  name: Stehlampe Schrank
   type: light
   cap_version: "light@1.2.0"
   technology: zigbee2mqtt
@@ -45,6 +48,7 @@ devices:
     state: "zigbee2mqtt/0x001788010d09176c"
     set: "zigbee2mqtt/0x001788010d09176c/set"
 - device_id: grosse_lampe_wohnzimmer
+  name: grosse Lampe
   type: relay
   cap_version: "relay@1.0.0"
   technology: zigbee2mqtt
@@ -59,6 +63,7 @@ devices:
     model: "AC10691"
     vendor: "OSRAM"
 - device_id: lampe_naehtischchen_wohnzimmer
+  name: Nähtischchen
   type: relay
   cap_version: "relay@1.0.0"
   technology: zigbee2mqtt
@@ -72,21 +77,8 @@ devices:
     ieee_address: "0x842e14fffee560ee"
     model: "HG06337"
     vendor: "Lidl"
-#- device_id: kleine_lampe_rechts_esszimmer
-#  type: relay
-#  cap_version: "relay@1.0.0"
-#  technology: zigbee2mqtt
-#  features:
-#    power: true
-#  topics:
-#    state: "zigbee2mqtt/0xf0d1b80000156645"
-#    set: "zigbee2mqtt/0xf0d1b80000156645/set"
-#  metadata:
-#    friendly_name: "kleine Lampe rechts Esszimmer"
-#    ieee_address: "0xf0d1b80000156645"
-#    model: "AC10691"
-#    vendor: "OSRAM"
 - device_id: kleine_lampe_links_esszimmer
+  name: kleine Lampe
   type: relay
   cap_version: "relay@1.0.0"
   technology: zigbee2mqtt
@@ -101,6 +93,7 @@ devices:
     model: "AC10691"
     vendor: "OSRAM"
 - device_id: leselampe_esszimmer
+  name: Leselampe
   type: light
   cap_version: "light@1.2.0"
   technology: zigbee2mqtt
@@ -116,6 +109,7 @@ devices:
     model: "LED1842G3"
     vendor: "IKEA"
 - device_id: medusalampe_schlafzimmer
+  name: Medusa-Lampe
   type: relay
   cap_version: "relay@1.0.0"
   technology: zigbee2mqtt
@@ -131,6 +125,7 @@ devices:
     vendor: "OSRAM"
 - device_id: sportlicht_am_fernseher_studierzimmer
   type: light
+  name: am Fernseher
   cap_version: "light@1.2.0"
   technology: zigbee2mqtt
   features:
@@ -146,6 +141,7 @@ devices:
     model: "LED1733G7"
     vendor: "IKEA"
 - device_id: deckenlampe_schlafzimmer
+  name: Deckenlampe
   type: light
   cap_version: "light@1.2.0"
   technology: zigbee2mqtt
@@ -161,6 +157,7 @@ devices:
     model: "8718699688882"
     vendor: "Philips"
 - device_id: bettlicht_wolfgang
+  name: Bettlicht Wolfgang
   type: light
   cap_version: "light@1.2.0"
   technology: zigbee2mqtt
@@ -176,6 +173,7 @@ devices:
     model: "9290020399"
     vendor: "Philips"
 - device_id: bettlicht_patty
+  name: Bettlicht Patty
   type: light
   cap_version: "light@1.2.0"
   technology: zigbee2mqtt
@@ -191,6 +189,7 @@ devices:
     model: "9290020399"
     vendor: "Philips"
 - device_id: schranklicht_hinten_patty
+  name: Schranklicht hinten
   type: light
   cap_version: "light@1.2.0"
   technology: zigbee2mqtt
@@ -206,6 +205,7 @@ devices:
     model: "8718699673147"
     vendor: "Philips"
 - device_id: schranklicht_vorne_patty
+  name: Schranklicht vorne
   type: relay
   cap_version: "relay@1.0.0"
   technology: zigbee2mqtt
@@ -220,6 +220,7 @@ devices:
     model: "AC10691"
     vendor: "OSRAM"
 - device_id: leselampe_patty
+  name: Leselampe
   type: light
   cap_version: "light@1.2.0"
   technology: zigbee2mqtt
@@ -235,6 +236,7 @@ devices:
     model: "8718699673147"
     vendor: "Philips"
 - device_id: deckenlampe_esszimmer
+  name: Deckenlampe
   type: light
   cap_version: "light@1.2.0"
   technology: zigbee2mqtt
@@ -249,23 +251,8 @@ devices:
     ieee_address: "0x0017880108a03e45"
     model: "929002241201"
     vendor: "Philips"
-#- device_id: standlampe_esszimmer
-#  type: light
-#  cap_version: "light@1.2.0"
-#  technology: zigbee2mqtt
-#  features:
-#    power: true
-#    brightness: true
-#    color_temperature: true
-#  topics:
-#    state: "zigbee2mqtt/0xbc33acfffe21f547"
-#    set: "zigbee2mqtt/0xbc33acfffe21f547/set"
-#  metadata:
-#    friendly_name: "Standlampe Esszimmer"
-#    ieee_address: "0xbc33acfffe21f547"
-#    model: "LED1732G11"
-#    vendor: "IKEA"
 - device_id: haustuer
+  name: Haustür-Lampe
   type: light
   cap_version: "light@1.2.0"
   technology: zigbee2mqtt
@@ -281,6 +268,7 @@ devices:
     model: "LED1842G3"
     vendor: "IKEA"
 - device_id: deckenlampe_flur_oben
+  name: Deckenlampe oben
   type: light
   cap_version: "light@1.2.0"
   technology: zigbee2mqtt
@@ -297,6 +285,7 @@ devices:
     model: "929003099001"
     vendor: "Philips"
 - device_id: kueche_deckenlampe
+  name: Deckenlampe
   type: light
   cap_version: "light@1.2.0"
   technology: zigbee2mqtt
@@ -312,6 +301,7 @@ devices:
     model: "929002469202"
     vendor: "Philips"
 - device_id: sportlicht_tisch
+  name: am Tisch
   type: light
   cap_version: "light@1.2.0"
   technology: zigbee2mqtt
@@ -327,6 +317,7 @@ devices:
     model: "4058075729063"
     vendor: "LEDVANCE"
 - device_id: sportlicht_regal
+  name: am Regal
   type: light
   cap_version: "light@1.2.0"
   technology: zigbee2mqtt
@@ -342,6 +333,7 @@ devices:
     model: "4058075729063"
     vendor: "LEDVANCE"
 - device_id: licht_flur_oben_am_spiegel
+  name: Spiegel
   type: light
   cap_version: "light@1.2.0"
   technology: zigbee2mqtt
@@ -393,6 +385,7 @@ devices:
     model: "GS361A-H04"
     vendor: "Siterwell"
 - device_id: thermostat_kueche
+  name: Heizung
   type: thermostat
   cap_version: "thermostat@1.0.0"
   technology: zigbee2mqtt
@@ -411,6 +404,7 @@ devices:
     model: "GS361A-H04"
     vendor: "Siterwell"
 - device_id: thermostat_schlafzimmer
+  name: Heizung
   type: thermostat
   cap_version: "thermostat@1.0.0"
   technology: max
@@ -429,6 +423,7 @@ devices:
     peer_id: "42"
     channel: "1"
 - device_id: thermostat_esszimmer
+  name: Heizung
   type: thermostat
   cap_version: "thermostat@1.0.0"
   technology: max
@@ -447,6 +442,7 @@ devices:
     peer_id: "45"
     channel: "1"
 - device_id: thermostat_wohnzimmer
+  name: Heizung
   type: thermostat
   cap_version: "thermostat@1.0.0"
   technology: max
@@ -465,6 +461,7 @@ devices:
     peer_id: "46"
     channel: "1"
 - device_id: thermostat_patty
+  name: Heizung
   type: thermostat
   cap_version: "thermostat@1.0.0"
   technology: max
@@ -483,6 +480,7 @@ devices:
     peer_id: "39"
     channel: "1"
 - device_id: thermostat_bad_oben
+  name: Heizung
   type: thermostat
   cap_version: "thermostat@1.0.0"
   technology: max
@@ -501,6 +499,7 @@ devices:
     peer_id: "41"
     channel: "1"
 - device_id: thermostat_bad_unten
+  name: Heizung
   type: thermostat
   cap_version: "thermostat@1.0.0"
   technology: max
@@ -519,6 +518,7 @@ devices:
     peer_id: "48"
     channel: "1"
 - device_id: sterne_wohnzimmer
+  name: Sterne
   type: relay
   cap_version: "relay@1.0.0"
   technology: zigbee2mqtt
@@ -533,6 +533,7 @@ devices:
     model: "AC10691"
     vendor: "OSRAM"
 - device_id: kontakt_schlafzimmer_strasse
+  name: Fenster
   type: contact
   name: Kontakt Schlafzimmer Straße
   cap_version: contact_sensor@1.0.0
@@ -549,6 +550,7 @@ devices:
     state: homegear/instance1/plain/26/1/STATE
   features: {}
 - device_id: kontakt_esszimmer_strasse_links
+  name: Fenster links
   type: contact
   name: Kontakt Esszimmer Straße links
   cap_version: contact_sensor@1.0.0
@@ -557,6 +559,7 @@ devices:
     state: homegear/instance1/plain/27/1/STATE
   features: {}
 - device_id: kontakt_wohnzimmer_garten_rechts
+  name: Fenster rechts
   type: contact
   name: Kontakt Wohnzimmer Garten rechts
   cap_version: contact_sensor@1.0.0
@@ -565,6 +568,7 @@ devices:
     state: homegear/instance1/plain/28/1/STATE
   features: {}
 - device_id: kontakt_wohnzimmer_garten_links
+  name: Fenster links
   type: contact
   name: Kontakt Wohnzimmer Garten links
   cap_version: contact_sensor@1.0.0
@@ -573,6 +577,7 @@ devices:
     state: homegear/instance1/plain/29/1/STATE
   features: {}
 - device_id: kontakt_kueche_garten_fenster
+  name: Fenster Garten
   type: contact
   name: Kontakt Küche Garten Fenster
   cap_version: contact_sensor@1.0.0
@@ -582,13 +587,14 @@ devices:
   features: {}
 - device_id: kontakt_kueche_garten_tuer
   type: contact
-  name: Kontakt Küche Garten Tür
+  name: Terrassentür
   cap_version: contact_sensor@1.0.0
   technology: zigbee2mqtt
   topics:
     state: zigbee2mqtt/0x00158d008b332788
   features: {}
 - device_id: kontakt_kueche_strasse_rechts
+  name: Fenster Straße rechts
   type: contact
   name: Kontakt Küche Straße rechts
   cap_version: contact_sensor@1.0.0
@@ -597,6 +603,7 @@ devices:
     state: zigbee2mqtt/0x00158d008b151803
   features: {}
 - device_id: kontakt_kueche_strasse_links
+  name: Fenster Straße links
   type: contact
   name: Fenster Straße links
   cap_version: contact_sensor@1.0.0
@@ -605,7 +612,7 @@ devices:
     state: zigbee2mqtt/0x00158d008b331d0b
   features: {}
 - device_id: kontakt_patty_garten_rechts
-  type: contact
+  type: Fenster Garten rechts
   name: Fenster Garten rechts
   cap_version: contact_sensor@1.0.0
   technology: max
@@ -638,7 +645,7 @@ devices:
   features: {}
 - device_id: kontakt_bad_oben_strasse
   type: contact
-  name: Kontakt Bad Oben Straße
+  name: Fenster
   cap_version: contact_sensor@1.0.0
   technology: zigbee2mqtt
   topics:
@@ -646,7 +653,7 @@ devices:
   features: {}
 - device_id: kontakt_bad_unten_strasse
   type: contact
-  name: Kontakt Bad Unten Straße
+  name: Fenster
   cap_version: contact_sensor@1.0.0
   technology: max
   topics:
@@ -654,7 +661,7 @@ devices:
   features: {}
 - device_id: sensor_schlafzimmer
   type: temp_humidity_sensor
-  name: Temperatur & Luftfeuchte
+  name: Thermometer
   cap_version: temp_humidity_sensor@1.0.0
   technology: zigbee2mqtt
   topics:
@@ -662,7 +669,7 @@ devices:
   features: {}
 - device_id: sensor_wohnzimmer
   type: temp_humidity_sensor
-  name: Temperatur & Luftfeuchte
+  name: Thermometer
   cap_version: temp_humidity_sensor@1.0.0
   technology: zigbee2mqtt
   topics:
@@ -670,7 +677,7 @@ devices:
   features: {}
 - device_id: sensor_kueche
   type: temp_humidity_sensor
-  name: Temperatur & Luftfeuchte
+  name: Thermometer
   cap_version: temp_humidity_sensor@1.0.0
   technology: zigbee2mqtt
   topics:
@@ -678,7 +685,7 @@ devices:
   features: {}
 - device_id: sensor_arbeitszimmer_patty
   type: temp_humidity_sensor
-  name: Temperatur & Luftfeuchte
+  name: Thermometer
   cap_version: temp_humidity_sensor@1.0.0
   technology: zigbee2mqtt
   topics:
@@ -686,7 +693,7 @@ devices:
   features: {}
 - device_id: sensor_arbeitszimmer_wolfgang
   type: temp_humidity_sensor
-  name: Temperatur & Luftfeuchte
+  name: Thermometer
   cap_version: temp_humidity_sensor@1.0.0
   technology: zigbee2mqtt
   topics:
@@ -694,7 +701,7 @@ devices:
   features: {}
 - device_id: sensor_bad_oben
   type: temp_humidity_sensor
-  name: Temperatur & Luftfeuchte
+  name: Thermometer
   cap_version: temp_humidity_sensor@1.0.0
   technology: zigbee2mqtt
   topics:
@@ -702,7 +709,7 @@ devices:
   features: {}
 - device_id: sensor_bad_unten
   type: temp_humidity_sensor
-  name: Temperatur & Luftfeuchte
+  name: Thermometer
   cap_version: temp_humidity_sensor@1.0.0
   technology: zigbee2mqtt
   topics:
@@ -710,7 +717,7 @@ devices:
   features: {}
 - device_id: sensor_flur
   type: temp_humidity_sensor
-  name: Temperatur & Luftfeuchte
+  name: Thermometer
   cap_version: temp_humidity_sensor@1.0.0
   technology: zigbee2mqtt
   topics:
@@ -718,7 +725,7 @@ devices:
   features: {}
 - device_id: sensor_waschkueche
   type: temp_humidity_sensor
-  name: Temperatur & Luftfeuchte
+  name: Thermometer
   cap_version: temp_humidity_sensor@1.0.0
   technology: zigbee2mqtt
   topics:
@@ -726,13 +733,14 @@ devices:
   features: {}
 - device_id: sensor_sportzimmer
   type: temp_humidity_sensor
-  name: Temperatur & Luftfeuchte
+  name: Thermometer
   cap_version: temp_humidity_sensor@1.0.0
   technology: zigbee2mqtt
   topics:
     state: zigbee2mqtt/0x00158d0009421422
   features: {}
 - device_id: licht_spuele_kueche
+  name: Spüle
   type: relay
   cap_version: "relay@1.0.0"
   technology: shelly
@@ -742,6 +750,7 @@ devices:
     set: "shellies/LightKitchenSink/relay/0/command"
     state: "shellies/LightKitchenSink/relay/0"
 - device_id: licht_schrank_esszimmer
+  name: Schrank
   type: relay
   cap_version: "relay@1.0.0"
   technology: shelly
@@ -752,6 +761,7 @@ devices:
     state: "shellies/schrankesszimmer/relay/0"
 - device_id: licht_regal_wohnzimmer
   type: relay
+  name: Regal
   cap_version: "relay@1.0.0"
   technology: shelly
   features:
@@ -761,6 +771,7 @@ devices:
     state: "shellies/wohnzimmer-regal/relay/0"
 - device_id: licht_flur_schrank
   type: relay
+  name: Schrank
   cap_version: "relay@1.0.0"
   technology: shelly
   features:
@@ -769,6 +780,7 @@ devices:
     set: "shellies/schrankflur/relay/0/command"
     state: "shellies/schrankflur/relay/0"
 - device_id: licht_terasse
+  name: Terrasse
   type: relay
   cap_version: "relay@1.0.0"
   technology: shelly