diff --git a/config/lovelace/home_dashboard/bedroom_dashboard.yaml b/config/lovelace/home_dashboard/bedroom_dashboard.yaml
index 147040b..ba1ba78 100644
--- a/config/lovelace/home_dashboard/bedroom_dashboard.yaml
+++ b/config/lovelace/home_dashboard/bedroom_dashboard.yaml
@@ -108,6 +108,12 @@
                   - type: custom:button-card
                     template: default
                     entity: binary_sensor.house_mode
+                    name: House
+                    tap_action:
+                      action: call-service
+                      service: input_select.select_next
+                      service_data:
+                        entity_id: input_select.house_mode
 
           - type: horizontal-stack
             title: Climate
diff --git a/config/packages/routines/bedtime.yaml b/config/packages/routines/bedtime.yaml
index 2a8fdda..f0c1593 100644
--- a/config/packages/routines/bedtime.yaml
+++ b/config/packages/routines/bedtime.yaml
@@ -36,5 +36,8 @@ script:
           - media_player.nvidia_shield
           - media_player.living_room_tv
           - light.ceiling
+          - light.kitchen
+          - light.hallway_main
+          - light.hallway_entrance
           - switch.titanium
       - service: script.dashboards_light_down
diff --git a/config/packages/routines/good_night.yaml b/config/packages/routines/good_night.yaml
index 375924b..8b89e6d 100644
--- a/config/packages/routines/good_night.yaml
+++ b/config/packages/routines/good_night.yaml
@@ -26,6 +26,9 @@ script:
       - service: homeassistant.turn_off
         entity_id:
           - light.all
+          - light.kitchen
+          - light.hallway_main
+          - light.hallway_entrance
           - media_player.nvidia_shield
           - media_player.living_room_tv
           - switch.titanium
diff --git a/config/packages/routines/waking_up.yaml b/config/packages/routines/waking_up.yaml
index 9e7135e..b492df7 100644
--- a/config/packages/routines/waking_up.yaml
+++ b/config/packages/routines/waking_up.yaml
@@ -20,6 +20,12 @@ script:
         data:
           brightness_pct: 100
 
+      - service: light.turn_on
+        entity_id:
+          - light.living_room_ambient
+          - light.bed_led
+          - light.bedside
+
       - condition: state
         entity_id: input_boolean.guest_mode
         state: "off"