Multi-room scenes leave upstairs bathroom alone if shower mode is on

packages/lighting_and_scenes.yaml

@@ -991,13 +991,12 @@ script:
             entity_id: input_text.emma_bedroom_selected_scene
           data:
             value: Adaptive
-      - choose:
-        - conditions:
+      - if:
         - condition: state
           entity_id: input_boolean.shower_mode
-            state: 'on'
-          sequence:
-            - stop: "Shower mode is on"
+          state: 'off'
+        then:
+        - choose:
           - conditions:
             - condition: state
               entity_id: binary_sensor.upstairs_bathroom_motion
@@ -1089,7 +1088,16 @@ script:
           entity_id:
             - light.hallway_overhead
             - light.master_bedroom_lights
-            - light.upstairs_bathroom_lights
+      - if:
+        - condition: state
+          entity_id: input_boolean.shower_mode
+          state: 'off'
+        then:
+        - service: input_select.select_option
+          target:
+            entity_id: input_select.upstairs_bathroom_scenes
+          data: 
+            option: Bright
       - if:
         - condition: state
           entity_id: input_boolean.kallen_sleeping
@@ -1112,10 +1120,19 @@ script:
         target:
           entity_id:
             - input_select.upstairs_hallway_scenes
-            - input_select.upstairs_bathroom_scenes
             - input_select.master_bedroom_scenes
         data:
           option: Bright
+      - if:
+        - condition: state
+          entity_id: input_boolean.shower_mode
+          state: 'off'
+        then:
+        - service: input_select.select_option
+          target:
+            entity_id: input_select.upstairs_bathroom_scenes
+          data:
+            option: Bright
       - if:
         - condition: template
           value_template: >
@@ -1282,6 +1299,11 @@ script:
               - input_select.upstairs_hallway_scenes
             data:
               option: Nightlight
+          - if:
+            - condition: state
+              entity_id: input_boolean.shower_mode
+              state: 'off'
+            then:
             - service: input_select.select_option
               target:
                 entity_id: input_select.upstairs_bathroom_scenes
@@ -1334,6 +1356,11 @@ script:
               - kallen_bedroom
               - emma_bedroom
               - upstairs_hallway
+          - if:
+            - condition: state
+              entity_id: input_boolean.shower_mode
+              state: 'off'
+            then:
             - service: input_select.select_option
               target:
                 entity_id: input_select.upstairs_bathroom_scenes