diff --git a/zigbee2mqtt/z2m-hue-dimmer-switch-configurable.yaml b/zigbee2mqtt/z2m-hue-dimmer-switch-configurable.yaml
index fcd0c4f..0769e5d 100644
--- a/zigbee2mqtt/z2m-hue-dimmer-switch-configurable.yaml
+++ b/zigbee2mqtt/z2m-hue-dimmer-switch-configurable.yaml
@@ -1,8 +1,9 @@
 blueprint:
   name: Zigbee2MQTT - Hue Dimmer Switch (324131092621) - Configurable
   description:
-    This blueprint is for the Hue Dimmer Switch (324131092621) being controlled via Zigbee2MQTT. This blueprint provides
-    configurable buttons for any action, rather than managing a set of lights directly.
+    This blueprint is for the Hue Dimmer Switch (324131092621) being controlled
+    via Zigbee2MQTT. This blueprint provides configurable buttons for any action,
+    rather than managing a set of lights directly.
   domain: automation
   input:
     dimmer_switch:
@@ -12,50 +13,51 @@ blueprint:
         entity:
           integration: mqtt
           domain: sensor
+          device_class: action
     on-press:
-      name: "On Press"
+      name: On Press
       description: Action to run when "On" button is pressed
       default: []
       selector:
         action: {}
     on-hold:
-      name: "On Hold"
+      name: On Hold
       description: Action to run when "On" button is held
       default: []
       selector:
         action: {}
     off-press:
-      name: "Off Press"
+      name: Off Press
       description: Action to run when "Off" button is pressed
       default: []
       selector:
         action: {}
     off-hold:
-      name: "Off Hold"
+      name: Off Hold
       description: Action to run when "Off" button is held
       default: []
       selector:
         action: {}
     up-press:
-      name: "Up Press"
+      name: Up Press
       description: Action to run when "Up" button is pressed
       default: []
       selector:
         action: {}
     up-hold:
-      name: "Up Hold"
+      name: Up Hold
       description: Action to run when "Up" button is held
       default: []
       selector:
         action: {}
     down-press:
-      name: "Down Press"
+      name: Down Press
       description: Action to run when "Down" button is pressed
       default: []
       selector:
         action: {}
     down-hold:
-      name: "Down Hold"
+      name: Down Hold
       description: Action to run when "Down" button is held
       default: []
       selector:
@@ -69,7 +71,7 @@ trigger:
     attribute: action
 action:
   - variables:
-      command: '{{ trigger.to_state.attributes.action }}'
+      command: "{{ trigger.to_state.state }}"
   - choose:
       - conditions:
           - "{{ command == 'on-press' }}"
diff --git a/zigbee2mqtt/z2m-hue-dimmer-switch-light.yaml b/zigbee2mqtt/z2m-hue-dimmer-switch-light.yaml
index b38a4c5..5c63e49 100644
--- a/zigbee2mqtt/z2m-hue-dimmer-switch-light.yaml
+++ b/zigbee2mqtt/z2m-hue-dimmer-switch-light.yaml
@@ -1,13 +1,16 @@
 blueprint:
   name: Zigbee2MQTT - Hue Dimmer Switch (324131092621) - Lights
   description:
-    This blueprint is for the Hue Dimmer Switch (324131092621) being controlled via Zigbee2MQTT. This blueprint provides
-    configuration for a light set, rather than individual buttons.
+    This blueprint is for the Hue Dimmer Switch (324131092621) being controlled
+    via Zigbee2MQTT. This blueprint provides configuration for a light set, rather
+    than individual buttons.
   domain: automation
   input:
     dimmer_switch:
       name: Dimmer Switch
-      description: The Hue Dimmer Switch to use for this automation. Pick the "Action" sensor for the Switch
+      description:
+        The Hue Dimmer Switch to use for this automation. Pick the "Action"
+        sensor for the Switch
       selector:
         entity:
           integration: mqtt
@@ -21,35 +24,35 @@ blueprint:
             domain: light
     force_brightness:
       name: Force turn on brightness
-      description: >
-        Force the brightness to the set level below, when the "on" button on
-        the remote is pushed and lights turn on.
+      description:
+        'Force the brightness to the set level below, when the "on" button
+        on the remote is pushed and lights turn on.'
       default: false
       selector:
-        boolean:
+        boolean: {}
     brightness:
       name: Brightness
       description: Brightness of the light(s) when turning on
       default: 50
       selector:
         number:
-          min: 0
-          max: 100
+          min: 0.0
+          max: 100.0
           mode: slider
-          step: 1
+          step: 1.0
           unit_of_measurement: "%"
-  source_url: https://github.com/nikdoof/homeassistant-blueprints/blob/main/zigbee2mqtt/z2m-hue-dimmer-switch-lights.yaml
+  source_url: https://github.com/nikdoof/homeassistant-blueprints/blob/main/zigbee2mqtt/z2m-hue-dimmer-switch-light.yaml
 mode: restart
 max_exceeded: silent
 variables:
-  force_brightness: !input force_brightness
+  force_brightness: !input "force_brightness"
 trigger:
   - platform: state
     entity_id: !input "dimmer_switch"
     attribute: action
 action:
   - variables:
-      command: '{{ trigger.to_state.attributes.action }}'
+      command: "{{ trigger.to_state.state }}"
   - choose:
       - conditions:
           - "{{ command == 'on-press' }}"
@@ -58,27 +61,27 @@ action:
               - conditions: "{{ force_brightness }}"
                 sequence:
                   - service: light.turn_on
-                    target: !input light
+                    target: !input "light"
                     data:
                       transition: 1
-                      brightness_pct: !input brightness
+                      brightness_pct: !input "brightness"
             default:
-              - service: light.turn_on
-                target: !input light
+              - service: light.toggle
+                target: !input "light"
                 data:
                   transition: 1
       - conditions:
           - "{{ command == 'off-press' }}"
         sequence:
           - service: light.turn_off
-            target: !input light
+            target: !input "light"
             data:
               transition: 1
       - conditions:
           - "{{ command == 'up-press' }}"
         sequence:
           - service: light.turn_on
-            target: !input light
+            target: !input "light"
             data:
               brightness_step_pct: 10
               transition: 1
@@ -88,7 +91,7 @@ action:
           - repeat:
               until:
                 - condition: state
-                  entity_id: !input dimmer_switch
+                  entity_id: !input "dimmer_switch"
                   state: up-hold-release
                   attribute: action
               sequence:
@@ -96,13 +99,13 @@ action:
                   data:
                     brightness_step_pct: 10
                     transition: 1
-                  target: !input light
+                  target: !input "light"
                 - delay: "1"
       - conditions:
           - "{{ command == 'down-press' }}"
         sequence:
           - service: light.turn_on
-            target: !input light
+            target: !input "light"
             data:
               brightness_step_pct: -10
               transition: 1
@@ -112,7 +115,7 @@ action:
           - repeat:
               until:
                 - condition: state
-                  entity_id: !input dimmer_switch
+                  entity_id: !input "dimmer_switch"
                   state: down-hold-release
                   attribute: action
               sequence:
@@ -120,5 +123,5 @@ action:
                   data:
                     brightness_step_pct: -10
                     transition: 1
-                  target: !input light
+                  target: !input "light"
                 - delay: "1"
diff --git a/zigbee2mqtt/z2m-hue-motion-sensor.yaml b/zigbee2mqtt/z2m-hue-motion-sensor.yaml
index 15d79c5..8a7a203 100644
--- a/zigbee2mqtt/z2m-hue-motion-sensor.yaml
+++ b/zigbee2mqtt/z2m-hue-motion-sensor.yaml
@@ -1,8 +1,9 @@
 blueprint:
   name: Zigbee2MQTT - Hue Motion Sensor (9290012607)
   description:
-    This blueprint is for the Hue Motion Sensor (9290012607) being controlled via Zigbee2MQTT.
-    If you have `occupancy_timeout` set on your Hue Sensors then the timeout below will be in addition of that timeout.
+    This blueprint is for the Hue Motion Sensor (9290012607) being controlled
+    via Zigbee2MQTT. If you have `occupancy_timeout` set on your Hue Sensors then
+    the timeout below will be in addition of that timeout.
   domain: automation
   input:
     motion_sensor:
@@ -22,66 +23,74 @@ blueprint:
             domain: light
     max_lux:
       name: Maximum Lux
-      description: If the lux value of the sensor is higher than this, then the lights will not be toggled on. Set to zero to disable.
+      description:
+        If the lux value of the sensor is higher than this, then the lights
+        will not be toggled on. Set to zero to disable.
       default: 140
       selector:
         number:
-          min: 0
-          max: 1000
+          min: 0.0
+          max: 1000.0
           unit_of_measurement: lux
+          mode: slider
+          step: 1.0
     timeout:
       name: Timeout
-      description: How long to keep the lights on for after the sensor stops detecting motion.
+      description:
+        How long to keep the lights on for after the sensor stops detecting
+        motion.
       default: 120
       selector:
         number:
-          min: 0
-          max: 1000
+          min: 0.0
+          max: 1000.0
           unit_of_measurement: seconds
+          mode: slider
+          step: 1.0
     brightness:
       name: Brightness
       description: Brightness of the light(s) when turning on
       default: 100
       selector:
         number:
-          min: 0
-          max: 100
+          min: 0.0
+          max: 100.0
           mode: slider
-          step: 1
+          step: 1.0
           unit_of_measurement: "%"
   source_url: https://github.com/nikdoof/homeassistant-blueprints/blob/main/zigbee2mqtt/z2m-hue-motion-sensor.yaml
 mode: restart
 max_exceeded: silent
 trigger:
   - platform: state
-    entity_id: !input motion_sensor
+    entity_id: !input "motion_sensor"
     to: "on"
   - platform: state
-    entity_id: !input motion_sensor
+    entity_id: !input "motion_sensor"
     to: "off"
     for:
-      seconds: !input timeout
+      seconds: !input "timeout"
 action:
   - choose:
       - conditions:
           - condition: template
             value_template: "{{ trigger.to_state.state == 'on' }}"
           - condition: numeric_state
-            entity_id: !input motion_sensor
+            entity_id: !input "motion_sensor"
             attribute: illuminance_lux
             above: -1
-            below: !input max_lux
+            below: !input "max_lux"
         sequence:
           - service: light.turn_on
-            target: !input target_lights
+            target: !input "target_lights"
             data:
               transition: 1
-              brightness_pct: !input brightness
+              brightness_pct: !input "brightness"
       - conditions:
           - condition: template
             value_template: "{{ trigger.to_state.state == 'off' }}"
         sequence:
           - service: light.turn_off
-            target: !input target_lights
+            target: !input "target_lights"
             data:
               transition: 1
diff --git a/zigbee2mqtt/z2m-ikea-onoff-switch.yaml b/zigbee2mqtt/z2m-ikea-onoff-switch.yaml
index b25ea0b..98ebd7f 100644
--- a/zigbee2mqtt/z2m-ikea-onoff-switch.yaml
+++ b/zigbee2mqtt/z2m-ikea-onoff-switch.yaml
@@ -1,9 +1,9 @@
 blueprint:
   name: Zigbee2MQTT - IKEA Tradfri On/Off Switch (E1743)
   description:
-    This blueprint is for the IKEA 2 button Trafri On/Off Switch (E1524/E1810) being controlled via Zigbee2MQTT.
-    Hold buttons will be repeated every second, so are useful for brightness adjustments or other adjustable
-    values.
+    This blueprint is for the IKEA 2 button Trafri On/Off Switch (E1524/E1810)
+    being controlled via Zigbee2MQTT. Hold buttons will be repeated every second,
+    so are useful for brightness adjustments or other adjustable values.
   domain: automation
   input:
     remote:
@@ -13,13 +13,13 @@ blueprint:
         entity:
           integration: mqtt
           domain: sensor
-    'on':
+    "on":
       name: "On"
       description: Action to run when ON button SHORT press
       default: []
       selector:
         action: {}
-    'off':
+    "off":
       name: "Off"
       description: Action to run when OFF button SHORT pressed
       default: []
@@ -46,7 +46,7 @@ trigger:
     attribute: action
 action:
   - variables:
-      command: '{{ trigger.to_state.attributes.action }}'
+      command: "{{ trigger.to_state.state }}"
   - choose:
       - conditions:
           - "{{ command == 'on' }}"
diff --git a/zigbee2mqtt/z2m-ikea-trafri-remote-control.yaml b/zigbee2mqtt/z2m-ikea-trafri-remote-control.yaml
index 638c5c8..1bbceab 100644
--- a/zigbee2mqtt/z2m-ikea-trafri-remote-control.yaml
+++ b/zigbee2mqtt/z2m-ikea-trafri-remote-control.yaml
@@ -1,9 +1,9 @@
 blueprint:
   name: Zigbee2MQTT - IKEA Tradfri Remote Control (E1524/E1810)
   description:
-    This blueprint is for the IKEA 5 button Trafri Remote Control (E1524/E1810) being controlled via Zigbee2MQTT.
-    Hold buttons will be repeated every second, so are useful for brightness adjustments or other adjustable
-    values.
+    This blueprint is for the IKEA 5 button Trafri Remote Control (E1524/E1810)
+    being controlled via Zigbee2MQTT. Hold buttons will be repeated every second,
+    so are useful for brightness adjustments or other adjustable values.
   domain: automation
   input:
     remote: