diff --git a/configuration.yaml b/configuration.yaml
index 6cddb74..1bb14fd 100644
--- a/configuration.yaml
+++ b/configuration.yaml
@@ -71,7 +71,8 @@ zwave:
   network_key: !secret zwave_key
 
 camera:
-  - platform: ffmpeg
-    input: !secret hall_camera_url
+  - platform: generic
+    still_image_url: !secret hall_camera_img
+    name: Hall
 
 ios:
diff --git a/groups.yaml b/groups.yaml
index 82b1608..216d33b 100644
--- a/groups.yaml
+++ b/groups.yaml
@@ -22,6 +22,8 @@ Presence:
   - device_tracker.bcc6
   - device_tracker.hera
 
-#Batteries:
-  #- zwave.fibaro_system_fgfs101_flood_sensor.battery_level
+Batteries:
+  - sensor.batt_frontdoor
+  - sensor.batt_flood
+  - sensor.batt_back_door
 
diff --git a/sensors.yaml b/sensors.yaml
index ae62529..591e388 100644
--- a/sensors.yaml
+++ b/sensors.yaml
@@ -48,9 +48,9 @@
   sensors:
     batt_frontdoor:
       friendly_name: 'Front Door Battery'
-      value_template: '{{ states.zwave.fibaro_system_fgk10x_door_opening_sensor_sensor.attributes.battery_level }}'
+      value_template: '{{ states.zwave.fibaro_system_fgk10x_door_opening_sensor.attributes.battery_level }}'
       unit_of_measurement: '%'
-      entity_id: zwave.fibaro_system_fgk10x_door_opening_sensor_sensor
+      entity_id: zwave.fibaro_system_fgk10x_door_opening_sensor
 
 - platform: template
   sensors:
@@ -64,7 +64,7 @@
   sensors:
     batt_back_door:
       friendly_name: 'Back Door Battery'
-      value_template: '{{ states.zwave.aeotec_zw112_door_window_sensor_6_sensor.attributes.battery_level }}'
+      value_template: '{{ states.zwave.aeotec_zw112_door_window_sensor_6.attributes.battery_level }}'
       unit_of_measurement: '%'
-      entity_id: zwave.aeotec_zw112_door_window_sensor_6_sensor
+      entity_id: zwave.aeotec_zw112_door_window_sensor_6