diff --git a/hue-dimmer-blueprint.yaml b/hue-dimmer-blueprint.yaml
index d6adfe9..eeb20cf 100644
--- a/hue-dimmer-blueprint.yaml
+++ b/hue-dimmer-blueprint.yaml
@@ -3,20 +3,48 @@ blueprint:
   description: Hue dimmer automation via hue integration
   domain: automation
   input:
-    button1:
-    button2:
-    button3:
-    button4:      
-    switch_device:
+    switch:
         selector:
             device:
     button1_short_press:
         selector:
             action:
+    button1_long_press:
+        selector:
+            action:
+    button1_repeat:
+        selector:
+            action:
+    button2_short_press:
+        selector:
+            action:
+    button2_long_press:
+        selector:
+            action:
+    button2_repeat:
+        selector:
+            action:
+    button3_short_press:
+        selector:
+            action:
+    button3_long_press:
+        selector:
+            action:
+    button3_repeat:
+        selector:
+            action:
+    button4_short_press:
+        selector:
+            action:
+    button4_long_press:
+        selector:
+            action:
+    button4_repeat:
+        selector:
+            action:
 triggers:
   - trigger: state
-    entity_id:
-      - !input button1
+    entity_id: var_button1
     attribute: event_type
     to:
       - short_release
@@ -122,3 +150,9 @@ actions:
               trigger.to_state.attributes.event_type == "repeat"}}
         sequence: []
 mode: single
+trigger_variables:
+  var_switch: !input switch
+  var_button1: {{ switch + "_button_1" }}
+  var_button1: {{ switch + "_button_2" }}
+  var_button1: {{ switch + "_button_3" }}
+  var_button1: {{ switch + "_button_4" }}
\ No newline at end of file