diff --git a/motion-activated-light.yaml b/motion-activated-light.yaml
index 8819a23..5730a8d 100644
--- a/motion-activated-light.yaml
+++ b/motion-activated-light.yaml
@@ -17,6 +17,9 @@ blueprint:
       selector:
         entity:
           domain: binary_sensor
+          # for some reason, using a device_class of motion_sensor ends up hiding the actual motion sensors
+          # device_class: motion_sensor
+
 
     delay_seconds_helper:
       name: "Delay seconds (helper)"
@@ -25,6 +28,7 @@ blueprint:
         entity:
           domain: input_number
 
+
     delay_seconds_default:
       name: "Default delay seconds"
       description: "The default delay before the motion-off sequence begins. Will be used to reset the running delay."
@@ -36,6 +40,7 @@ blueprint:
           step: 1
           mode: box
 
+
     notice_seconds:
       name: "Notice seconds"
       description: "The number of seconds to wait in the Prep1 (Notice) scene."
@@ -47,6 +52,7 @@ blueprint:
           step: 1
           mode: box
 
+
     warning_seconds:
       name: "Warning seconds"
       description: "The number of seconds to wait in the Prep2 (Warning) scene."
@@ -58,6 +64,7 @@ blueprint:
           step: 1
           mode: box
 
+
     scene_on:
       name: "On Scene"
       description: "The scene to activate when motion is detected"
@@ -65,6 +72,7 @@ blueprint:
         entity:
           domain: scene
 
+
     scene_off_prep_1:
       name: "Off Prep Scene 1 (Notice)"
       description: "The first scene to activate when motion is no longer detected (notice phase)."
@@ -72,6 +80,7 @@ blueprint:
         entity:
           domain: scene
 
+
     scene_off_prep_2:
       name: "Off Prep Scene 2 (Warning)"
       description: "The second scene to activate when motion is no longer detected (warning phase)."
@@ -79,6 +88,7 @@ blueprint:
         entity:
           domain: scene
 
+
     scene_off:
       name: "Off Scene"
       description: "The scene to activate when the user has failed to produce motion, and the light should be considered \"off\"."
@@ -87,17 +97,26 @@ blueprint:
           domain: scene
 
 
+    on_just_before_off:
+      name: "Use On scene just before Off scene."
+      description: "Toggle this to \"on\" if you would like the \"On\" scene to trigger just before the \"Off\" scene. This is sometimes helpful to mitigate an issue where the \"On\" scene doesn't apply all colors and settings correctly from an \"Off\" state."
+      selector:
+        boolean: {}
+
+
 #############
 ### Variables
 #############
 
 variables:
 
-  motion_sensor: !input motion_sensor
-  delay_seconds: !input delay_seconds_helper
-  delay_seconds_default: !input delay_seconds_default
-  notice_seconds: !input notice_seconds
-  warning_seconds: !input warning_seconds
+  motion_sensor:          !input motion_sensor
+  delay_seconds:          !input delay_seconds_helper
+  delay_seconds_default:  !input delay_seconds_default
+  notice_seconds:         !input notice_seconds
+  warning_seconds:        !input warning_seconds
+  on_just_before_off:     !input on_just_before_off
+
 
 ############
 ### Triggers
@@ -123,6 +142,13 @@ action:
       name: "First log"
       message: "Motion automation has started. Delay counter is: {{ states[delay_seconds].state }}"
 
+  - alias: "Debug log the on_just_before_off bool"
+    enabled: false
+    service: logbook.log
+    data:
+      name: "Debug: On just before off?"
+      message: "On just before off is: {{ on_just_before_off }} "
+
   - if:
       - condition: state
         entity_id: !input motion_sensor
@@ -154,6 +180,7 @@ action:
           message: "Initiating motion-off sequence, because motion no longer detected."
 
 
+    # Initial period where nothing happens
       - alias: "Delay appropriately before doing anything"
         wait_template: "{{ states[motion_sensor].state == 'on' }}"
         timeout: "{{ states[delay_seconds].state }}"
@@ -171,6 +198,7 @@ action:
 
 
 
+      # Notice period, where the notice scene is shown
       - alias: "Log that the notice period has begun."
         service: logbook.log
         data:
@@ -205,6 +233,8 @@ action:
           name: "Notice period finished."
           message: "Notice period has finished (motion is still off)."
 
+
+      # Warning period, just before the light turns off. The warning scene is shown.
       - alias: "Log that the warning period has begun."
         service: logbook.log
         data:
@@ -240,6 +270,26 @@ action:
           message: "Warning period has finished and motion is still off."
 
 
+      # Finally, we decide to actually turn off the lights with the "Off" scene.
+
+      # Maybe turn on the "On" scene just before the "Off" scene, if the user enabled this option
+      - if:
+        - condition: template
+          value_template: "{{ on_just_before_off == true  }}"
+        then:
+          - alias: "Do a debug log"
+            enabled: false
+            service: logbook.log
+            data:
+              name: "DEBUG: Will turn on before off?"
+              message: "Yes, will turn on just before off!"
+          - service: scene.turn_on
+            target:
+              entity_id: !input scene_on
+          - alias: "Wait a second to set the \"On\" scene."
+            delay:
+              seconds: 1
+
       - parallel:
         - alias: "Activate Scene: Off (Done)"
           service: scene.turn_on