diff --git a/blueprints/automation/apply_lighting_mode.yaml b/blueprints/automation/apply_lighting_mode.yaml
index d165013..642f683 100644
--- a/blueprints/automation/apply_lighting_mode.yaml
+++ b/blueprints/automation/apply_lighting_mode.yaml
@@ -2,30 +2,29 @@ blueprint:
   name: Apply Lighting Mode Settings
   description: Data-driven mode application using convention-based entity lookup
   domain: automation
+  input:
+    mode_input_select:
+      name: Mode Input Select
+      description: Dropdown helper tracking current lighting mode
+      selector:
+        entity:
+          domain: input_select
 
-input:
-  mode_input_select:
-    name: Mode Input Select
-    description: Dropdown helper tracking current lighting mode
-    selector:
-      entity:
-        domain: input_select
+    adaptive_lighting_switch:
+      name: Adaptive Lighting Switch
+      description: AL switch for this room
+      selector:
+        entity:
+          domain: switch
+          integration: adaptive_lighting
 
-  adaptive_lighting_switch:
-    name: Adaptive Lighting Switch
-    description: AL switch for this room
-    selector:
-      entity:
-        domain: switch
-        integration: adaptive_lighting
-
-  led_color_entity:
-    name: LED Color Entity (Optional)
-    description: Number entity for LED color (e.g., Inovelli switch)
-    default: {}
-    selector:
-      entity:
-        domain: number
+    led_color_entity:
+      name: LED Color Entity (Optional)
+      description: Number entity for LED color (e.g., Inovelli switch)
+      default: {}
+      selector:
+        entity:
+          domain: number
 
 mode: restart
 max_exceeded: silent
diff --git a/blueprints/automation/weekend_mode_apply_settings.yaml b/blueprints/automation/weekend_mode_apply_settings.yaml
index c23484c..516fba4 100644
--- a/blueprints/automation/weekend_mode_apply_settings.yaml
+++ b/blueprints/automation/weekend_mode_apply_settings.yaml
@@ -2,47 +2,46 @@ blueprint:
   name: Weekend Mode Apply Settings
   description: Adjust AL settings when weekend mode toggles
   domain: automation
+  input:
+    weekend_mode_boolean:
+      name: Weekend Mode Boolean
+      description: Toggle helper for weekend mode
+      selector:
+        entity:
+          domain: input_boolean
 
-input:
-  weekend_mode_boolean:
-    name: Weekend Mode Boolean
-    description: Toggle helper for weekend mode
-    selector:
-      entity:
-        domain: input_boolean
+    adaptive_lighting_switch:
+      name: Adaptive Lighting Switch
+      description: AL switch to adjust
+      selector:
+        entity:
+          domain: switch
+          integration: adaptive_lighting
 
-  adaptive_lighting_switch:
-    name: Adaptive Lighting Switch
-    description: AL switch to adjust
-    selector:
-      entity:
-        domain: switch
-        integration: adaptive_lighting
+    sunrise_time:
+      name: Weekend Sunrise Time
+      description: Delayed sunrise time for weekends
+      default: "10:00:00"
+      selector:
+        time:
 
-  sunrise_time:
-    name: Weekend Sunrise Time
-    description: Delayed sunrise time for weekends
-    default: "10:00:00"
-    selector:
-      time:
+    sunset_time:
+      name: Weekend Sunset Time
+      description: Extended sunset time for weekends
+      default: "01:00:00"
+      selector:
+        time:
 
-  sunset_time:
-    name: Weekend Sunset Time
-    description: Extended sunset time for weekends
-    default: "01:00:00"
-    selector:
-      time:
-
-  max_brightness:
-    name: Weekend Max Brightness
-    description: Reduced max brightness for weekends
-    default: 60
-    selector:
-      number:
-        min: 1
-        max: 100
-        step: 1
-        unit_of_measurement: "%"
+    max_brightness:
+      name: Weekend Max Brightness
+      description: Reduced max brightness for weekends
+      default: 60
+      selector:
+        number:
+          min: 1
+          max: 100
+          step: 1
+          unit_of_measurement: "%"
 
 mode: restart
 max_exceeded: silent
diff --git a/blueprints/automation/weekend_mode_schedule.yaml b/blueprints/automation/weekend_mode_schedule.yaml
index 4ad15c7..b753d17 100644
--- a/blueprints/automation/weekend_mode_schedule.yaml
+++ b/blueprints/automation/weekend_mode_schedule.yaml
@@ -2,21 +2,20 @@ blueprint:
   name: Weekend Mode Schedule
   description: Auto-enable/disable weekend mode based on day of week
   domain: automation
+  input:
+    weekend_mode_boolean:
+      name: Weekend Mode Boolean
+      description: Toggle helper for weekend mode
+      selector:
+        entity:
+          domain: input_boolean
 
-input:
-  weekend_mode_boolean:
-    name: Weekend Mode Boolean
-    description: Toggle helper for weekend mode
-    selector:
-      entity:
-        domain: input_boolean
-
-  toggle_time:
-    name: Toggle Time
-    description: Time to check and toggle weekend mode
-    default: "22:00:00"
-    selector:
-      time:
+    toggle_time:
+      name: Toggle Time
+      description: Time to check and toggle weekend mode
+      default: "22:00:00"
+      selector:
+        time:
 
 mode: single
 max_exceeded: silent