diff --git a/groups.yaml b/groups.yaml
index f10fc56..f83ce46 100644
--- a/groups.yaml
+++ b/groups.yaml
@@ -21,6 +21,7 @@ Lights:
   view: yes
   name: Lights
   entities:
+    - device_tracker.huebridge
     - group.livingroom_lights
     - group.bedroom_lights
 
@@ -62,6 +63,7 @@ consoles:
     - device_tracker.PS3
     - device_tracker.PS4
     - device_tracker.WiiU
+    - device_tracker.Switch
 
 chromecast:
   name: Chromecast
@@ -73,6 +75,7 @@ phones:
   entities:
     - device_tracker.CorrelsPixel
     - device_tracker.StephaniesIphone
+    - device_tracker.LindasGalaxyS9
     - device_tracker.PhilsGalaxyS7Edge
 
 overrides:
diff --git a/packages/camera.yaml b/packages/camera.yaml
index f0ce2c4..44d5bed 100644
--- a/packages/camera.yaml
+++ b/packages/camera.yaml
@@ -26,6 +26,7 @@ group:
     view: yes
     icon: mdi:cctv
     entities:
+      - device_tracker.htconem8
       - camera.living_room_camera
       - group.camera_sensors
       - group.camera_switches