diff --git a/parabolic_alarm.yaml b/parabolic_alarm.yaml
index 4cdb9b9..3668878 100644
--- a/parabolic_alarm.yaml
+++ b/parabolic_alarm.yaml
@@ -9,6 +9,12 @@ blueprint:
       default: []
       selector:
         action: {}
+    conditions:
+      name: Conditions
+      description: Set your own conditions for this automation. All conditions must pass unles you add your own OR block
+      default: []
+      selector:
+        condition:
     alarm_start_time:
       name: 🕒 Start Time
       description:
@@ -28,26 +34,6 @@ blueprint:
       default: "-00:00:00"
       selector:
         text:
-    workday_sensor:
-      name: 📆 Workday Sensor
-      description:
-        Binary Sensor that is used to determine whether it should run. Typically
-        from Workday Integration. More information here - https://www.home-assistant.io/integrations/workday/
-      selector:
-        entity:
-          filter:
-            - domain:
-                - binary_sensor
-          multiple: false
-    person_sensor:
-      name: 👤 Person Sensor
-      description: Select the person sensor so that the alarm will only run when you are home.
-      selector:
-        entity:
-          filter:
-            - domain:
-                - person
-          multiple: false
     alarm_script:
       name: 📄 Script to trigger
       description: Light Alarm Script
@@ -58,14 +44,12 @@ blueprint:
                 - script
           multiple: false
     target_light:
-      name: 💡 Lights
-      description: The light(s) with kelvin
+      description: A single light or group
       selector:
         entity:
           filter:
-            - domain:
-                - light
-          multiple: false
+            domain: light
+      name: Target Light
     light_timeout:
       name: ⏱️ Timeout
       description: Light will turn off after this time on last run. Setting this to 0 will leave the light on.
@@ -199,12 +183,8 @@ trigger:
       entity_id: !input alarm_start_time
       offset: !input offset_from_start_time
 condition:
-  - condition: state
-    entity_id: !input workday_sensor
-    state: "on"
-  - condition: state
-    entity_id: !input person_sensor
-    state: "home"
+  condition: and
+  conditions: !input conditions
 action:
   - choose:
       - conditions: []
diff --git a/parabolic_alarm_script.yaml b/parabolic_alarm_script.yaml
index 1a42077..0ca66ce 100644
--- a/parabolic_alarm_script.yaml
+++ b/parabolic_alarm_script.yaml
@@ -112,7 +112,7 @@ sequence:
             seconds: "{{ individual_step }}"
         - if:
             - condition: template
-              value_template: "{{ is_state(target_light, 'on') }}"
+              value_template: "{{ not is_state(target_light, 'off') }}"
           then:
             - data:
                 brightness: "{{ brightness }}"
@@ -126,7 +126,7 @@ sequence:
           - condition: template
             value_template: "{{ light_timeout != 0 }}"
           - condition: template
-            value_template: "{{ is_state(target_light, 'on') }}"
+            value_template: "{{ not is_state(target_light, 'off') }}"
     then:
       - delay:
           minutes: "{{ light_timeout }}"