diff --git a/configuration/automations/alarm.yaml b/configuration/automations/alarm.yaml
index 190b0dc..1dfe2d5 100644
--- a/configuration/automations/alarm.yaml
+++ b/configuration/automations/alarm.yaml
@@ -112,6 +112,28 @@
         data:
           url:  "/lovelace-tablet/security"
 
+- id: alarm-away-test-vibration
+  alias: '[Alarm] Window vibration test'
+  trigger:
+    - platform: state
+      entity_id: binary_sensor.office_vibration
+      to: 'on'
+  condition:
+#    - condition: state
+#      entity_id: alarm_control_panel.home_alarm
+#      state: armed_away
+  action:
+#    - service: alarm_control_panel.alarm_trigger
+#      entity_id: alarm_control_panel.home_alarm
+    - service: notify.mobile_app_iphone
+      data:
+        title: "Vibration Test ALARM!"
+        message: >
+          {{ state_attr(trigger.entity_id, 'friendly_name') }}
+        data:
+          entity_id: camera.living_room
+          url:  "/lovelace-tablet/security"
+
 - id: alarm-night
   alias: '[Alarm] Trigger alarm at night'
   trigger:
diff --git a/configuration/automations/info-battery.yaml b/configuration/automations/info-battery.yaml
index 9fb8d5f..a65a8f0 100644
--- a/configuration/automations/info-battery.yaml
+++ b/configuration/automations/info-battery.yaml
@@ -161,6 +161,9 @@
     - platform: numeric_state
       below: '10'
       entity_id: sensor.office_thermostat_battery_level
+    - platform: numeric_state
+      below: '10'
+      entity_id: sensor.office_window_vibration_sensor_battery
     - platform: numeric_state
       below: '10'
       entity_id: sensor.office_window_sensor_battery
diff --git a/configuration/automations/info-unavailable-notice.yaml b/configuration/automations/info-unavailable-notice.yaml
index 601ffdf..b2f5f79 100644
--- a/configuration/automations/info-unavailable-notice.yaml
+++ b/configuration/automations/info-unavailable-notice.yaml
@@ -303,12 +303,6 @@
       platform: device
       type: device_offline
       subtype: device_offline
-    # Front door vibration
-    - device_id: f5e5356b4a45190ec2dad08ca9f991e8
-      domain: zha
-      platform: device
-      type: device_offline
-      subtype: device_offline
     # Hallway Button
     - device_id: cc4f08a2e2f0e5aebc43b87164378795
       domain: zha
@@ -430,6 +424,12 @@
       platform: device
       type: device_offline
       subtype: device_offline
+    # Office Window vibration
+    - device_id: f5e5356b4a45190ec2dad08ca9f991e8
+      domain: zha
+      platform: device
+      type: device_offline
+      subtype: device_offline
     # Printer button
     - device_id: 0c23a8e92f43f628e584dc1805c6915e
       domain: zha