diff --git a/configuration/automations/kitchen-motion.yaml b/configuration/automations/kitchen-motion.yaml
index 26a4d77..6bb70dd 100644
--- a/configuration/automations/kitchen-motion.yaml
+++ b/configuration/automations/kitchen-motion.yaml
@@ -48,53 +48,53 @@
                 brightness_pct: 5
                 kelvin: 2700
 
-- id: kitchen-vibration
-  alias: '[Kitchen] Vibration'
-  trigger:
-    - platform: state
-      entity_id: binary_sensor.kitchen_worktop_accelerometer
-      to: 'on'
-  action:
-    - choose:
-        - conditions:
-            - condition: state
-              entity_id: input_select.home_mode
-              state: Day
-            - condition: numeric_state
-              entity_id: sensor.kitchen_motion_sensor_illuminance
-              below: '21'
-          sequence:
-            - choose:
-                - conditions:
-                    - condition: state
-                      entity_id: input_boolean.sleep_mode
-                      state: 'on'
-                  sequence:
-                    - service: light.turn_on
-                      entity_id: light.kitchen_lights
-                      data:
-                        brightness_pct: 100
-                        kelvin: 2000
-                - conditions:
-                    - condition: state
-                      entity_id: input_boolean.sleep_mode
-                      state: 'off'
-                  sequence:
-                    - service: light.turn_on
-                      entity_id: light.kitchen_lights
-                      data:
-                        brightness_pct: 100
-                        kelvin: 3200
-        - conditions:
-            - condition: state
-              entity_id: input_select.home_mode
-              state: Night
-          sequence:
-            - service: light.turn_on
-              entity_id: light.kitchen_lights
-              data:
-                brightness_pct: 5
-                kelvin: 2700
+#- id: kitchen-vibration
+#  alias: '[Kitchen] Vibration'
+#  trigger:
+#    - platform: state
+#      entity_id: binary_sensor.kitchen_worktop_accelerometer
+#      to: 'on'
+#  action:
+#    - choose:
+#        - conditions:
+#            - condition: state
+#              entity_id: input_select.home_mode
+#              state: Day
+#            - condition: numeric_state
+#              entity_id: sensor.kitchen_motion_sensor_illuminance
+#              below: '21'
+#          sequence:
+#            - choose:
+#                - conditions:
+#                    - condition: state
+#                      entity_id: input_boolean.sleep_mode
+#                      state: 'on'
+#                  sequence:
+#                    - service: light.turn_on
+#                      entity_id: light.kitchen_lights
+#                      data:
+#                        brightness_pct: 100
+#                        kelvin: 2000
+#                - conditions:
+#                    - condition: state
+#                      entity_id: input_boolean.sleep_mode
+#                      state: 'off'
+#                  sequence:
+#                    - service: light.turn_on
+#                      entity_id: light.kitchen_lights
+#                      data:
+#                        brightness_pct: 100
+#                        kelvin: 3200
+#        - conditions:
+#            - condition: state
+#              entity_id: input_select.home_mode
+#              state: Night
+#          sequence:
+#            - service: light.turn_on
+#              entity_id: light.kitchen_lights
+#              data:
+#                brightness_pct: 5
+#                kelvin: 2700
 
 - id: kitchen-lights-off
   alias: '[Kitchen] Lights Off'
@@ -105,22 +105,22 @@
       for: '0:02:00'
       from: 'on'
       to: 'off'
-    - platform: state
-      entity_id: binary_sensor.kitchen_worktop_accelerometer
-      for: '0:02:00'
-      from: 'on'
-      to: 'off'
+#    - platform: state
+#      entity_id: binary_sensor.kitchen_worktop_accelerometer
+#      for: '0:02:00'
+#      from: 'on'
+#      to: 'off'
   condition:
     - condition: state
       entity_id: binary_sensor.kitchen_motion_sensor
       state: 'off'
       for: '0:02:00'
-    - condition: not
-      conditions:
-        - condition: state
-          entity_id: binary_sensor.kitchen_worktop_accelerometer
-          state: 'off'
-          for: '0:02:00'
+#    - condition: not
+#      conditions:
+#        - condition: state
+#          entity_id: binary_sensor.kitchen_worktop_accelerometer
+#          state: 'off'
+#          for: '0:02:00'
   action:
     - service: light.turn_off
       entity_id: light.kitchen_lights
diff --git a/configuration/automations/unavailable-notice.yaml b/configuration/automations/unavailable-notice.yaml
index 802fd8a..61b78f1 100644
--- a/configuration/automations/unavailable-notice.yaml
+++ b/configuration/automations/unavailable-notice.yaml
@@ -362,7 +362,7 @@
       data:
         title: "Device unavailable"
         message: >
-          {{ state_attr(trigger.event.data.entity_id, 'friendly_name') }} is unavailable for 5 minutes
+          {{ state_attr(trigger.data.entity_id, 'friendly_name') }} is unavailable for 5 minutes
         data:
           channel: Notfall
           priority: high