diff --git a/alexa.yaml b/alexa.yaml
index 56bcd84..28f5e86 100644
--- a/alexa.yaml
+++ b/alexa.yaml
@@ -35,4 +35,7 @@
         description: Harmony - SteamLink
       switch.harmony_playstation:
         name: Playstation
-        description: Harmony - Playstation
\ No newline at end of file
+        description: Harmony - Playstation
+      switch.harmony_denon_power:
+        name: Receiver
+        description: Harmony - Denon AVR
\ No newline at end of file
diff --git a/configuration.yaml b/configuration.yaml
index 75b38c8..d387fd3 100644
--- a/configuration.yaml
+++ b/configuration.yaml
@@ -79,6 +79,10 @@ influxdb:
       - sensor.instagram_mtb_follows
       - sensor.instagram_mtb_media
 
+deconz:
+  host: !secret deconz_ip
+  port: !secret deconz_port
+
 map:
 
 mqtt:
diff --git a/lovelace-views/devices.yaml b/lovelace-views/devices.yaml
index 30ef19c..e2619d3 100644
--- a/lovelace-views/devices.yaml
+++ b/lovelace-views/devices.yaml
@@ -1,28 +1,22 @@
 icon: mdi:cellphone-link
 path: devices
 cards:
-  - type: horizontal-stack
-    cards:
-    - type: entities
-      title: Handy Florian
-      show_header_toggle: false
-      entities:
-        - entity: device_tracker.mobile_fb
-          name: Standort
-        - entity: sensor.mobile_fb_battery
-          name: Akku
-          icon: mdi:battery
-        - entity: sensor.mobile_fb_callstate
-          name: Anrufstatus
-    - type: entities
-      title: Handy Jenny
-      show_header_toggle: false
-      entities:
-        - entity: device_tracker.mobile_fb
-          name: Standort
-        - entity: sensor.mobile_fb_battery
-          name: Akku
-          icon: mdi:battery
-        - entity: sensor.mobile_fb_callstate
-          name: Anrufstatus
+  - type: entities
+    title: Florian
+    show_header_toggle: false
+    entities:
+      - entity: device_tracker.mobile_fb
+        name: Standort
+      - entity: sensor.device_mobile_fb_battery
+        name: Handy-Akku
+        icon: mdi:battery
+  - type: entities
+    title: Jenny
+    show_header_toggle: false
+    entities:
+      - entity: device_tracker.mobile_fb
+        name: Standort
+      - entity: sensor.device_mobile_fb_battery
+        name: Handy-Akku
+        icon: mdi:battery
 
diff --git a/lovelace-views/livingroom.yaml b/lovelace-views/livingroom.yaml
index 804ab05..4fb0abc 100644
--- a/lovelace-views/livingroom.yaml
+++ b/lovelace-views/livingroom.yaml
@@ -38,9 +38,9 @@ cards:
           - type: picture-glance
             title: Denon AVR
             entities:
-              - entity: switch.harmony_mute
+              - entity: switch.harmony_denon_mute
                 icon: mdi:volume-off
-              - entity: switch.harmony_power
+              - entity: switch.harmony_denon_power
                 icon: mdi:power
             image: /local/images/denon.jpg
             state_image:
diff --git a/lovelace-views/overview.yaml b/lovelace-views/overview.yaml
index 2e2b87c..f73fe1d 100644
--- a/lovelace-views/overview.yaml
+++ b/lovelace-views/overview.yaml
@@ -11,6 +11,12 @@ cards:
       - sensor.attic_humidity
   - type: vertical-stack
     cards:
+        - type: entities
+          title: Nächste Bahn nach Münster
+          show_header_toggle: false
+          entities:
+            - entity: sensor.salzbergen_to_munster_hbf
+              name: Abfahrt
         - type: map
           aspect_ratio: 16:9
           default_zoom: 15
@@ -19,13 +25,4 @@ cards:
         - type: glance
           title: Geräte
           entities:
-            - device_tracker.mobile_fb
-
-  - type: entities
-    title: Nächste Bahn nach Münster
-    show_header_toggle: false
-    entities:
-      - entity: sensor.salzbergen_to_munster_hbf
-        name: Abfahrt
-      - entity: sensor.salzbergen_to_munster_hbf_delay
-        name: Verspätung
\ No newline at end of file
+            - device_tracker.mobile_fb
\ No newline at end of file
diff --git a/sensors/devices.yaml b/sensors/devices.yaml
new file mode 100644
index 0000000..dcd8d31
--- /dev/null
+++ b/sensors/devices.yaml
@@ -0,0 +1,5 @@
+  - platform: template
+    sensors:
+      device_mobile_fb_battery:
+        value_template: '{{ states.device_tracker.mobile_fb.attributes.battery }}'
+        unit_of_measurement: '%'
\ No newline at end of file
diff --git a/sensors/misc.yaml b/sensors/misc.yaml
index 1a93816..507c9d4 100644
--- a/sensors/misc.yaml
+++ b/sensors/misc.yaml
@@ -14,7 +14,5 @@
     to: "Münster HBF"
   - platform: template
     sensors:
-      salzbergen_to_munster_hbf_delay:
-        value_template: '{{ states.sensor.salzbergen_to_munster_hbf.attributes.delay }}'
       salzbergen_to_munster_hbf_ontime:
         value_template: '{{ states.sensor.salzbergen_to_munster_hbf.attributes.ontime }}'
\ No newline at end of file
diff --git a/sensors/weather.yaml b/sensors/weather.yaml
deleted file mode 100644
index bb8df6e..0000000
--- a/sensors/weather.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-- platform: buienradar
-  monitored_conditions:
-    - temperature
-    - humidity
-    - windspeed
-    - winddirection
-    - precipitation
-    - condition
-    - conditionexact
-
diff --git a/switches.yaml b/switches.yaml
index 96375e7..b3f560d 100644
--- a/switches.yaml
+++ b/switches.yaml
@@ -52,7 +52,7 @@
           entity_id: remote.livingroom_harmony
           activity: 'PowerOff'
 
-    harmony_mute:
+    harmony_denon_mute:
       value_template: "{{ state_attr('remote.livingroom_harmony', 'current_activity') != 'PowerOff' }}"
       turn_on:
         service: remote.send_command
@@ -71,7 +71,7 @@
           device: 42849850 #Denon
           delay_secs: 0.6
 
-    harmony_power:
+    harmony_denon_power:
       value_template: "{{ state_attr('remote.livingroom_harmony', 'current_activity') != 'PowerOff' }}"
       turn_on:
         service: remote.send_command