diff --git a/config/packages/modules/lighting/areas/bedroom.yaml b/config/packages/modules/lighting/areas/bedroom.yaml
index 960e606..0c47b68 100644
--- a/config/packages/modules/lighting/areas/bedroom.yaml
+++ b/config/packages/modules/lighting/areas/bedroom.yaml
@@ -97,9 +97,14 @@ automation:
       entity_id: binary_sensor.bedroom_door
       to: "on"
     condition:
-      condition: sun
-      after: sunset
-      after_offset: "-02:00:00"
+      condition: and
+      conditions:
+        - condition: sun
+          after: sunset
+          after_offset: "-02:00:00"
+        - condition: state
+          entity_id: input_select.house_mode
+          state: 'day'
     action:
       - service: light.turn_on
         entity_id: light.master_bedroom_main
diff --git a/config/packages/routines/bedtime.yaml b/config/packages/routines/bedtime.yaml
index 47d2f16..495a825 100644
--- a/config/packages/routines/bedtime.yaml
+++ b/config/packages/routines/bedtime.yaml
@@ -46,6 +46,10 @@ script:
           - light.kitchen_secondary
           - light.hallway_main
           - light.hallway_entrance
+          - switch.titanium
+      - service: light.turn_on
+        entity_id:
           - light.browser_kitchen
           - light.browser_hallway
-          - switch.titanium
+        data:
+          brightness_pct: 1
diff --git a/config/packages/routines/good_night.yaml b/config/packages/routines/good_night.yaml
index 80812e9..217c54f 100644
--- a/config/packages/routines/good_night.yaml
+++ b/config/packages/routines/good_night.yaml
@@ -31,9 +31,14 @@ script:
           - light.kitchen_secondary
           - light.hallway_main
           - light.hallway_entrance
-          - light.browser_kitchen
-          - light.browser_hallway
           - media_player.nvidia_shield
           - media_player.living_room_tv
           - switch.titanium
           - group.all_radiators
+
+      - service: light.turn_on
+        entity_id:
+          - light.browser_kitchen
+          - light.browser_hallway
+        data:
+          brightness_pct: 1
diff --git a/config/packages/routines/waking_up.yaml b/config/packages/routines/waking_up.yaml
index b492df7..4dd38e1 100644
--- a/config/packages/routines/waking_up.yaml
+++ b/config/packages/routines/waking_up.yaml
@@ -26,6 +26,11 @@ script:
           - light.bed_led
           - light.bedside
 
+      - service: cover.set_cover_position
+        entity_id: cover.living_room
+        data:
+          position: 80
+
       - condition: state
         entity_id: input_boolean.guest_mode
         state: "off"