diff --git a/group/battery_levels.yaml b/group/battery_levels.yaml
index 09ad98d..adf2e7a 100644
--- a/group/battery_levels.yaml
+++ b/group/battery_levels.yaml
@@ -1,30 +1,42 @@
 battery_levels:
   name: Battery Levels
   entities:
-    # Smoke Detectors (CR123A)
-    #- sensor.main_lounge_smoke_detector_zsm01_battery
-    #- sensor.downstairs_lounge_lounge_smoke_detector_zsm02_battery
-    # Leak Detection (Button cell 2032)
+    # Moes Multi Button Scene Switches (CR2430)
+    - sensor.master_bedroom_scene_switch_east_zss02_battery
+    - sensor.master_bedroom_scene_switch_west_zss01_battery
+    # Xiaomi Round Buttons (Button cell 2032)
+    - sensor.laundry_drier_start_button_zbt01_battery
+    # Xiaomi Vibration Sensor (Button cell 2032)
+    - sensor.vibration_sensor_1_zvi01_battery
+    # Smoke Detectors (CR123A) NO BATTERY INFO
+    #NO READING- sensor.main_lounge_smoke_detector_zsm01_battery
+    #NO READING- sensor.downstairs_lounge_lounge_smoke_detector_zsm02_battery
+    # Xiaomi Leak Detection (Button cell 2032)
     - sensor.main_kitchen_sink_leak_zlk01_battery
     - sensor.guest_bathroom_laundry_sink_leak_zlk02_battery
     - sensor.basement_laundry_floor_leak_zlk03_battery
-    - sensor.downstairs_kitchen_sink_leak_zlk04_battery
-    # Temp, Humidity Sensors (Button cell 2032)
+    # offline - sensor.downstairs_kitchen_sink_leak_zlk04_battery
+    # Tuya Leak Detection (2x AA Batteries)
+    - sensor.downstairs_kitchen_sink_leak_zlk05_battery
+    - sensor.downstairs_bathroom_leak_zlk06_battery
+    # Xiaomi Temp, Humidity Sensors (Button cell 2032)
     - sensor.master_bedroom_temperature_zth01_battery
     - sensor.bedroom_2_temperature_zth02_battery
     - sensor.bedroom_3_temperature_zth03_battery
     - sensor.main_bathroom_temperature_zth04_battery
     - sensor.storage_loft_temperature_zth05_battery
     - sensor.downstairs_bedroom_1_temperature_zth06_battery
-    # Temp, Humidity Sensors (2x AAA Batteries)
+    # Tuya Temp, Humidity Sensors (2x AAA Batteries)
     - sensor.humidor_environment_zth07_battery
     - sensor.main_kitchen_fridge_temp_zth08_battery
-    # Multisensor Sensors (2X CR123A OR 5V MicroUSB)
-    #- sensor.main_kitchen_multisensor_zms01_battery
+    # Fantem multisensor Sensors (2X CR123A OR 5V MicroUSB)
+    #TEMP DISABLE - sensor.main_kitchen_multisensor_zms01_battery
     - sensor.data_cupboard_multisensor_zms02_battery
-    # LCD Temp, Humidity Sensors (2x AAA Batteries)
+    # Tuya LCD Temp, Humidity Sensors (2x AAA Batteries)
     - sensor.office_lcd_temperature_ztl01_battery
     - sensor.master_bedroom_lcd_temperature_ztl02_battery
     - sensor.downstairs_lounge_lcd_temperature_ztl03_battery
     # Sonoff PIR (CR2450)
     - sensor.piano_pir_zir01_battery
+    # Tuya Reed Switch (2x AAA Batteries)
+    #NO READING - sensor.downstairs_bedrooms_hatch_zrs01_battery