diff --git a/groups.yaml b/groups.yaml
index 86ceebc..4fdf4be 100644
--- a/groups.yaml
+++ b/groups.yaml
@@ -16,14 +16,14 @@ bedroom_lights:
     - light.correls_nightstand
     - light.stephanies_nightstand
     - light.bedroom_lamp
+    - light.shelf_lamp
+    - light.wall_strip
     - scene.colorful
     - scene.speed_of_sound_sonic
 office_lights:
   name: Office
   entities:
-    - light.shelf_lamp
     - light.office_lamp
-    - light.wall_strip
 consoles:
   name: Gaming Consoles
   entities:
diff --git a/packages/battlestation.yaml b/packages/battlestation.yaml
index 1f9bf61..2b564da 100644
--- a/packages/battlestation.yaml
+++ b/packages/battlestation.yaml
@@ -5,7 +5,7 @@ scene:
         state: on
         brightness: 255
         xy_color: [0.37, 0.372]
-      light.office_lamp:
+      light.bedroom_lamp:
         state: on
         brightness: 255
         xy_color: [0.37, 0.372]
@@ -19,7 +19,7 @@ scene:
         state: on
         brightness: 255
         rgb_color: [255, 61, 18]
-      light.office_lamp:
+      light.bedroom_lamp:
         state: on
         brightness: 255
         rgb_color: [255, 59, 191]
@@ -33,7 +33,7 @@ scene:
         state: on
         brightness: 1
         rgb_color: [255, 118, 23]
-      light.office_lamp:
+      light.bedroom_lamp:
         state: on
         brightness: 1
         rgb_color: [255, 118, 23]
@@ -47,7 +47,7 @@ scene:
         state: on
         rgb_color: [247, 168, 184]
         brightness: 246
-      light.office_lamp:
+      light.bedroom_lamp:
         state: on
         rgb_color: [255, 255, 255]
         brightness: 255
@@ -61,7 +61,7 @@ scene:
         state: on
         brightness: 255
         rgb_color: [255, 0, 0]
-      light.office_lamp:
+      light.bedroom_lamp:
         state: on
         brightness: 255
         rgb_color: [255, 0, 0]
diff --git a/packages/sunrise.yaml b/packages/sunrise.yaml
index 312e8fa..b8fa6f9 100644
--- a/packages/sunrise.yaml
+++ b/packages/sunrise.yaml
@@ -5,6 +5,10 @@ scene:
         state: on
         brightness: 1
         xy_color: [0.6042, 0.3739]
+      light.shelf_lamp:
+        state: on
+        brightness: 1
+        xy_color: [0.6042, 0.3739]
   - name: Dawn Daylight
     entities:
       light.correls_nightstand:
@@ -22,6 +26,11 @@ scene:
         transition: 1800
         brightness: 254
         xy_color: [0.3769, 0.3639]
+      light.shelf_lamp:
+        state: on
+        transition: 1800
+        brightness: 254
+        xy_color: [0.3769, 0.3639]
   - name: Sunrise Daylight
     entities:
       light.correls_nightstand:
diff --git a/scenes.yaml b/scenes.yaml
index 757bb6d..2bf39a8 100644
--- a/scenes.yaml
+++ b/scenes.yaml
@@ -52,6 +52,10 @@
       state: on
       brightness: 212
       xy_color: [0.451,0.3803]
+    light.shelf_lamp:
+      state: on
+      brightness: 212
+      xy_color: [0.451,0.3803]
     light.correls_nightstand:
       state: on
       brightness: 212
@@ -66,6 +70,10 @@
       state: on
       brightness: 92
       xy_color: [0.324,0.154]
+    light.shelf_lamp:
+      state: on
+      brightness: 92
+      xy_color: [0.324,0.154]
     light.correls_nightstand:
       state: on
       brightness: 92