diff --git a/configuration/automations/info-unavailable-notice.yaml b/configuration/automations/info-unavailable-notice.yaml
index 798880c..3332086 100644
--- a/configuration/automations/info-unavailable-notice.yaml
+++ b/configuration/automations/info-unavailable-notice.yaml
@@ -3,7 +3,7 @@
   description: ''
   mode: single
   trigger:
-    # 3d printer button
+    # 3D printer button
     - device_id: a2ac0fa69738b8e7c5c1b8b8bcf8cdc2
       domain: zha
       platform: device
@@ -15,50 +15,8 @@
       platform: device
       type: device_offline
       subtype: device_offline
-    # Computer Button
-    - device_id: 5b972523e427721ec88e095994f7cc16
-      domain: zha
-      platform: device
-      type: device_offline
-      subtype: device_offline
-    # Bathroom Mirror 2
-    - device_id: 431a642993b3f6ced020af47220e8daa
-      domain: zha
-      platform: device
-      type: device_offline
-      subtype: device_offline
-    # Bathroom Mirror 3
-    - device_id: 27282412549132bda9825729d1a10a93
-      domain: zha
-      platform: device
-      type: device_offline
-      subtype: device_offline
-    # Bathroom Mirror 1
-    - device_id: ba7b7736a67d7cbe1243c4600ff7172a
-      domain: zha
-      platform: device
-      type: device_offline
-      subtype: device_offline
-    # Bedroom button
-    - device_id: 15b083b6b5e2acb5d37fbbfbfc76281f
-      domain: zha
-      platform: device
-      type: device_offline
-      subtype: device_offline
-    # Bedroom motion
-    - device_id: cd1e032a1a26de8ba1396bf91f197e47
-      domain: zha
-      platform: device
-      type: device_offline
-      subtype: device_offline
-    # Office Blind button
-    - device_id: a47c928b108240ed8866f9f7a70bc844
-      domain: zha
-      platform: device
-      type: device_offline
-      subtype: device_offline
-    # Bathroom Music Button
-    - device_id: e233cdffb05076ad7bb049581ffa8c9c
+    # Bathroom 1
+    - device_id: e4e2b5a5acbc659acda6903255347b2f
       domain: zha
       platform: device
       type: device_offline
@@ -75,134 +33,38 @@
       platform: device
       type: device_offline
       subtype: device_offline
-    # Bathroom 1
-    - device_id: e4e2b5a5acbc659acda6903255347b2f
-      domain: zha
-      platform: device
-      type: device_offline
-      subtype: device_offline
-    # Shower 3
-    - device_id: 69c278dd0b4837d8841eb18e2a31db4d
-      domain: zha
-      platform: device
-      type: device_offline
-      subtype: device_offline
-    # Shower 1
-    - device_id: 0671395ab7b8b41f3c4c18b609761014
-      domain: zha
-      platform: device
-      type: device_offline
-      subtype: device_offline
-    # Shower 2
-    - device_id: e4fca1e680076337f8f651c9343e8f34
-      domain: zha
-      platform: device
-      type: device_offline
-      subtype: device_offline
-    # Shower 4
-    - device_id: 30a22e9003809f544b312f28fa06c959
-      domain: zha
-      platform: device
-      type: device_offline
-      subtype: device_offline
-    # Shower Motion
-    - device_id: 80f3d0b9aa7ec4d108e6fdb99de88c5c
-      domain: zha
-      platform: device
-      type: device_offline
-      subtype: device_offline
-    # Kitchen Camera Outlet
-    - device_id: d828efb2920a65f809572b4443949c34
-      domain: zha
-      platform: device
-      type: device_offline
-      subtype: device_offline
-    # Washing Machine Leak
-    - device_id: 37960f1a830a898ad4ea92664ae4b496
-      domain: zha
-      platform: device
-      type: device_offline
-      subtype: device_offline
-    # Dishwasher
-    - device_id: 3597031909bf2286b98bde5af5f30bdb
-      domain: zha
-      platform: device
-      type: device_offline
-      subtype: device_offline
-    # Sink Sensor
-    - device_id: c29730675b75e537380faf0a77feee5b
-      domain: zha
-      platform: device
-      type: device_offline
-      subtype: device_offline
-    # Office Window
-    - device_id: ceab8d95ef12c5ebd406302ec0f4178d
-      domain: zha
-      platform: device
-      type: device_offline
-      subtype: device_offline
-    # Weather
-    - device_id: 634c77691a8165970265cf32c44230f8
-      domain: zha
-      platform: device
-      type: device_offline
-      subtype: device_offline
-    # Kitchen button
-    - device_id: d2550c7b3da088e146edf7dc9d295310
-      domain: zha
-      platform: device
-      type: device_offline
-      subtype: device_offline
     # Bathroom 4
     - device_id: 2d1ba9769188a3e96dcffaf5936bf373
       domain: zha
       platform: device
       type: device_offline
       subtype: device_offline
-    # Freezer door
-    - device_id: 988edb7d9919162f3682500e295c40d4
+    # Bathroom Button
+    - device_id: 36bf09a72c8115dd3afd832e83cf38ea
       domain: zha
       platform: device
       type: device_offline
       subtype: device_offline
-    # Fridge leak sensor
-    - device_id: dd0622ae6241b21492fccccd97bad7bc
+    # Bathroom Mirror Button New
+    - device_id: ea9d3cc90cf5da1108925e50489efce9
       domain: zha
       platform: device
       type: device_offline
       subtype: device_offline
-    # Front door vibration
-    - device_id: f5e5356b4a45190ec2dad08ca9f991e8
+    # Bathroom Color Left
+    - device_id: 4e6ee35e16903d669c9377a2c54506ad
       domain: zha
       platform: device
       type: device_offline
       subtype: device_offline
-    # Bedroom window
-    - device_id: f6bbab8171167a6adaeee8e9df5e1e44
+    # Bathroom color middle
+    - device_id: a0e6c36436d0e9b13917a19cb1c73334
       domain: zha
       platform: device
       type: device_offline
       subtype: device_offline
-    # Dining Window 1
-    - device_id: df86a6dac9abad36589f94053f4ccf33
-      domain: zha
-      platform: device
-      type: device_offline
-      subtype: device_offline
-    # Dining Window 2
-    - device_id: 5ddf37413c92dd8f92e4e2c2af82864c
-      domain: zha
-      platform: device
-      type: device_offline
-      subtype: device_offline
-    # Washing Machine
-    - device_id: 6abd174075f468c040ac51979dfd09af
-      domain: zha
-      platform: device
-      type: device_offline
-      subtype: device_offline
-    # Bathroom Motion
-    - device_id: f7f7369ab75c9166e3e07eada7ec24d4
+    # Bathroom Color Right
+    - device_id: ff995d287a703404440c5953ff306725
       domain: zha
       platform: device
       type: device_offline
@@ -213,8 +75,98 @@
       platform: device
       type: device_offline
       subtype: device_offline
-    # Rack smoke sensor
-    - device_id: c78013fc9d2556dcab3ebe30ee68bc5d
+    # Bathroom Mirror 1
+    - device_id: ba7b7736a67d7cbe1243c4600ff7172a
+      domain: zha
+      platform: device
+      type: device_offline
+      subtype: device_offline
+    # Bathroom Mirror 2
+    - device_id: 431a642993b3f6ced020af47220e8daa
+      domain: zha
+      platform: device
+      type: device_offline
+      subtype: device_offline
+    # Bathroom Mirror 3
+    - device_id: 27282412549132bda9825729d1a10a93
+      domain: zha
+      platform: device
+      type: device_offline
+      subtype: device_offline
+    # Bathroom Motion
+    - device_id: f7f7369ab75c9166e3e07eada7ec24d4
+      domain: zha
+      platform: device
+      type: device_offline
+      subtype: device_offline
+    # Bathroom Music Button
+    - device_id: e233cdffb05076ad7bb049581ffa8c9c
+      domain: zha
+      platform: device
+      type: device_offline
+      subtype: device_offline
+    # Bathroom sensor
+    - device_id: 63f513a5ae3e3506f1a894d0d8a40ffe
+      domain: zha
+      platform: device
+      type: device_offline
+      subtype: device_offline
+    # Bathroom Shower 1
+    - device_id: 0671395ab7b8b41f3c4c18b609761014
+      domain: zha
+      platform: device
+      type: device_offline
+      subtype: device_offline
+    # Bathroom Shower 2
+    - device_id: e4fca1e680076337f8f651c9343e8f34
+      domain: zha
+      platform: device
+      type: device_offline
+      subtype: device_offline
+    # Bathroom Shower 3
+    - device_id: 69c278dd0b4837d8841eb18e2a31db4d
+      domain: zha
+      platform: device
+      type: device_offline
+      subtype: device_offline
+    # Bathroom Shower 4
+    - device_id: 30a22e9003809f544b312f28fa06c959
+      domain: zha
+      platform: device
+      type: device_offline
+      subtype: device_offline
+    # Bathroom Shower Motion
+    - device_id: 80f3d0b9aa7ec4d108e6fdb99de88c5c
+      domain: zha
+      platform: device
+      type: device_offline
+      subtype: device_offline
+    # Bathroom Washing Machine
+    - device_id: 6abd174075f468c040ac51979dfd09af
+      domain: zha
+      platform: device
+      type: device_offline
+      subtype: device_offline
+    # Bathroom Washing Machine Leak
+    - device_id: 37960f1a830a898ad4ea92664ae4b496
+      domain: zha
+      platform: device
+      type: device_offline
+      subtype: device_offline
+    # Bedroom Bed Button
+    - device_id: 0d584dbfe721e00880b38c4dfc1c108e
+      domain: zha
+      platform: device
+      type: device_offline
+      subtype: device_offline
+    # Bedroom bed motion sensor
+    - device_id: 958ab5fb4d4c53dbd9772aeb8b5d9b7f
+      domain: zha
+      platform: device
+      type: device_offline
+      subtype: device_offline
+    # Bedroom Blinds Button
+    - device_id: c90f649df514f80d36ca1a8fde308867
       domain: zha
       platform: device
       type: device_offline
@@ -231,92 +183,8 @@
       platform: device
       type: device_offline
       subtype: device_offline
-    # Dining Blind Right
-    - device_id: bb1e3890ee9f3b9de027a1af1c70ab92
-      domain: zha
-      platform: device
-      type: device_offline
-      subtype: device_offline
-    # Dining Blind Right
-    - device_id: ce8736246afb209b4d51f87be53cb191
-      domain: zha
-      platform: device
-      type: device_offline
-      subtype: device_offline
-    # Dining Blind Middle
-    - device_id: 958ab5fb4d4c53dbd9772aeb8b5d9b7f
-      domain: zha
-      platform: device
-      type: device_offline
-      subtype: device_offline
-    # Dining Blind controller (button)
-    - device_id: 6818c2a8921603a8a04e6c6f4d45a8ec
-      domain: zha
-      platform: device
-      type: device_offline
-      subtype: device_offline
-    # Front Door Lock Button
-    - device_id: d30d25752f5e6741eb8d9562f5b44897
-      domain: zha
-      platform: device
-      type: device_offline
-      subtype: device_offline
-    # Bed Button
-    - device_id: 0d584dbfe721e00880b38c4dfc1c108e
-      domain: zha
-      platform: device
-      type: device_offline
-      subtype: device_offline
-    # OSRAM PLUG 01
-    - device_id: 49ddcff859ee646e49cbae5781d49222
-      domain: zha
-      platform: device
-      type: device_offline
-      subtype: device_offline
-    # Modem
-    - device_id: f78edddd4ac841160c71f4a2b06b690c
-      domain: zha
-      platform: device
-      type: device_offline
-      subtype: device_offline
-    # Living Room Button
-    - device_id: 6f68b487f932c9b73d17ff82cb453617
-      domain: zha
-      platform: device
-      type: device_offline
-      subtype: device_offline
-    # Coffee machine
-    - device_id: f22514f08e0a5e9f56af5e3c588bb97a
-      domain: zha
-      platform: device
-      type: device_offline
-      subtype: device_offline
-    # Office Blind
-    - device_id: 1d39eb0ec70af8a92ee2faa5db18d204
-      domain: zha
-      platform: device
-      type: device_offline
-      subtype: device_offline
-    # Kitchen sink button
-    - device_id: 1610374adcb5c5c1a763616a57411eac
-      domain: zha
-      platform: device
-      type: device_offline
-      subtype: device_offline
-    # Bedroom Blinds Button
-    - device_id: c90f649df514f80d36ca1a8fde308867
-      domain: zha
-      platform: device
-      type: device_offline
-      subtype: device_offline
-    # 3D Printer Enclosure Fan
-    - device_id: 3d87588b498ed4a82627d0081332015f
-      domain: zha
-      platform: device
-      type: device_offline
-      subtype: device_offline
-    # Computer Outlet
-    - device_id: 4d209e26971ac237d9792f370f844587
+    # Bedroom button
+    - device_id: 15b083b6b5e2acb5d37fbbfbfc76281f
       domain: zha
       platform: device
       type: device_offline
@@ -327,62 +195,26 @@
       platform: device
       type: device_offline
       subtype: device_offline
-    # Front Door
-    - device_id: 671a24524db60c56b0a182ac816faf20
-      domain: zha
-      platform: device
-      type: device_offline
-      subtype: device_offline
-    # Hallway Motion
-    - device_id: dcfb2052711f7b4458c0a12e7ee479de
-      domain: zha
-      platform: device
-      type: device_offline
-      subtype: device_offline
-    # Bathroom Color Right
-    - device_id: ff995d287a703404440c5953ff306725
-      domain: zha
-      platform: device
-      type: device_offline
-      subtype: device_offline
-    # Bathroom Color Left
-    - device_id: 4e6ee35e16903d669c9377a2c54506ad
-      domain: zha
-      platform: device
-      type: device_offline
-      subtype: device_offline
-    # Front Door Lock
-    - device_id: bc7822a199f47bb5d73bbda1055f649c
-      domain: zha
-      platform: device
-      type: device_offline
-      subtype: device_offline
-    # Humidifier
+    # Bedroom Humidifier
     - device_id: 740338e04236501ea50dd60485a405c0
       domain: zha
       platform: device
       type: device_offline
       subtype: device_offline
-    # Hallway Button
-    - device_id: cc4f08a2e2f0e5aebc43b87164378795
+    # Bedroom motion
+    - device_id: cd1e032a1a26de8ba1396bf91f197e47
       domain: zha
       platform: device
       type: device_offline
       subtype: device_offline
-    # Office illuminance sensor
-    - device_id: 9c0cfd20fd5b926615e816400912ebd5
+    # Bedroom window
+    - device_id: f6bbab8171167a6adaeee8e9df5e1e44
       domain: zha
       platform: device
       type: device_offline
       subtype: device_offline
-    # Bathroom sensor
-    - device_id: 63f513a5ae3e3506f1a894d0d8a40ffe
-      domain: zha
-      platform: device
-      type: device_offline
-      subtype: device_offline
-    # Bathroom color middle
-    - device_id: a0e6c36436d0e9b13917a19cb1c73334
+    # Dining Blind controller (button)
+    - device_id: 6818c2a8921603a8a04e6c6f4d45a8ec
       domain: zha
       platform: device
       type: device_offline
@@ -393,55 +225,224 @@
       platform: device
       type: device_offline
       subtype: device_offline
-    # Bathroom Button
-    - device_id: 36bf09a72c8115dd3afd832e83cf38ea
+    # Dining Blind Middle
+    - device_id: ce8736246afb209b4d51f87be53cb191
       domain: zha
       platform: device
       type: device_offline
       subtype: device_offline
-    # Table Lamp 2
-    - device_id: b1a3a895aa0d0a6099dbdd3f138cfb6a
+    # Dining Blind Right
+    - device_id: bb1e3890ee9f3b9de027a1af1c70ab92
       domain: zha
       platform: device
       type: device_offline
       subtype: device_offline
-    # Table Lamp 3
-    - device_id: 18ad1e945c1ddd3c2f61bcf1bf19d7de
+    # Dining illuminance sensor
+    - device_id: 9c0cfd20fd5b926615e816400912ebd5
       domain: zha
       platform: device
       type: device_offline
       subtype: device_offline
-    # Bathroom Mirror Button New
-    - device_id: ea9d3cc90cf5da1108925e50489efce9
-      domain: zha
-      platform: device
-      type: device_offline
-      subtype: device_offline
-    # Table lamp 1
+    # Dining Table lamp 1
     - device_id: f931a95e4f3ac3cc4f0e8adcfe386a22
       domain: zha
       platform: device
       type: device_offline
       subtype: device_offline
-    # Sink motion sensor
-    - device_id: a1f7d8f69ffde756029a04c631b4b674
+    # Dining Table Lamp 2
+    - device_id: b1a3a895aa0d0a6099dbdd3f138cfb6a
       domain: zha
       platform: device
       type: device_offline
       subtype: device_offline
-    # Weather sensor
+    # Dining Table Lamp 3
+    - device_id: 18ad1e945c1ddd3c2f61bcf1bf19d7de
+      domain: zha
+      platform: device
+      type: device_offline
+      subtype: device_offline
+    # Dining Window 1
+    - device_id: df86a6dac9abad36589f94053f4ccf33
+      domain: zha
+      platform: device
+      type: device_offline
+      subtype: device_offline
+    # Dining Window 2
+    - device_id: 5ddf37413c92dd8f92e4e2c2af82864c
+      domain: zha
+      platform: device
+      type: device_offline
+      subtype: device_offline
+    # Front Door
+    - device_id: 671a24524db60c56b0a182ac816faf20
+      domain: zha
+      platform: device
+      type: device_offline
+      subtype: device_offline
+    # Front Door Lock
+    - device_id: bc7822a199f47bb5d73bbda1055f649c
+      domain: zha
+      platform: device
+      type: device_offline
+      subtype: device_offline
+    # Front Door Lock Button
+    - device_id: d30d25752f5e6741eb8d9562f5b44897
+      domain: zha
+      platform: device
+      type: device_offline
+      subtype: device_offline
+    # Front door vibration
     - device_id: f5e5356b4a45190ec2dad08ca9f991e8
       domain: zha
       platform: device
       type: device_offline
       subtype: device_offline
-    # Z-Wave Kitchen tabletop motion
+    # Hallway Button
+    - device_id: cc4f08a2e2f0e5aebc43b87164378795
+      domain: zha
+      platform: device
+      type: device_offline
+      subtype: device_offline
+    # Hallway Motion
+    - device_id: dcfb2052711f7b4458c0a12e7ee479de
+      domain: zha
+      platform: device
+      type: device_offline
+      subtype: device_offline
+    # Kitchen button
+    - device_id: d2550c7b3da088e146edf7dc9d295310
+      domain: zha
+      platform: device
+      type: device_offline
+      subtype: device_offline
+    # Kitchen Camera Outlet
+    - device_id: d828efb2920a65f809572b4443949c34
+      domain: zha
+      platform: device
+      type: device_offline
+      subtype: device_offline
+    # Kitchen Coffee machine
+    - device_id: 9e869c08e1f92a2f3d8a85c0d1b11dd7
+      domain: zha
+      platform: device
+      type: device_offline
+      subtype: device_offline
+    # Kitchen Coffee machine (old)
+    - device_id: f22514f08e0a5e9f56af5e3c588bb97a
+      domain: zha
+      platform: device
+      type: device_offline
+      subtype: device_offline
+    # Kitchen Dishwasher
+    - device_id: 3597031909bf2286b98bde5af5f30bdb
+      domain: zha
+      platform: device
+      type: device_offline
+      subtype: device_offline
+    # Kitchen Freezer door
+    - device_id: 988edb7d9919162f3682500e295c40d4
+      domain: zha
+      platform: device
+      type: device_offline
+      subtype: device_offline
+    # Kitchen Fridge leak sensor
+    - device_id: dd0622ae6241b21492fccccd97bad7bc
+      domain: zha
+      platform: device
+      type: device_offline
+      subtype: device_offline
+    # Kitchen sink button
+    - device_id: 1610374adcb5c5c1a763616a57411eac
+      domain: zha
+      platform: device
+      type: device_offline
+      subtype: device_offline
+    # Kitchen Sink motion sensor
+    - device_id: a1f7d8f69ffde756029a04c631b4b674
+      domain: zha
+      platform: device
+      type: device_offline
+      subtype: device_offline
+    # Kitchen Sink Sensor
+    - device_id: c29730675b75e537380faf0a77feee5b
+      domain: zha
+      platform: device
+      type: device_offline
+      subtype: device_offline
+    # Kitchen tabletop motion (Z-Wave)
     - platform: device
       device_id: c7bb75d230dd4f8a5b7ece910f00c583
       domain: zwave_js
       type: state.node_status
       entity_id: sensor.node_6_node_status
       to: dead
+    # Living Room Button
+    - device_id: 6f68b487f932c9b73d17ff82cb453617
+      domain: zha
+      platform: device
+      type: device_offline
+      subtype: device_offline
+    # Office Blind Left
+    - device_id: 3e091d8ff8d780f05277bcb6cfacf17d
+      domain: zha
+      platform: device
+      type: device_offline
+      subtype: device_offline
+    # Office Blind Right
+    - device_id: 1d39eb0ec70af8a92ee2faa5db18d204
+      domain: zha
+      platform: device
+      type: device_offline
+      subtype: device_offline
+    # Office Blind button
+    - device_id: a47c928b108240ed8866f9f7a70bc844
+      domain: zha
+      platform: device
+      type: device_offline
+      subtype: device_offline
+    # Office Computer Button
+    - device_id: 5b972523e427721ec88e095994f7cc16
+      domain: zha
+      platform: device
+      type: device_offline
+      subtype: device_offline
+    # Office Computer Outlet
+    - device_id: 4d209e26971ac237d9792f370f844587
+      domain: zha
+      platform: device
+      type: device_offline
+      subtype: device_offline
+    # Office Window
+    - device_id: ceab8d95ef12c5ebd406302ec0f4178d
+      domain: zha
+      platform: device
+      type: device_offline
+      subtype: device_offline
+    # Rack Modem
+    - device_id: f78edddd4ac841160c71f4a2b06b690c
+      domain: zha
+      platform: device
+      type: device_offline
+      subtype: device_offline
+    # Rack smoke sensor
+    - device_id: c78013fc9d2556dcab3ebe30ee68bc5d
+      domain: zha
+      platform: device
+      type: device_offline
+      subtype: device_offline
+    # Weather sensor
+    - device_id: 634c77691a8165970265cf32c44230f8
+      domain: zha
+      platform: device
+      type: device_offline
+      subtype: device_offline
+
+    # OSRAM PLUG 01
+    - device_id: 49ddcff859ee646e49cbae5781d49222
+      domain: zha
+      platform: device
+      type: device_offline
+      subtype: device_offline
   action:
     - service: notify.mobile_app_iphone_pg
       data: