diff --git a/blueprint.yaml b/blueprint.yaml
index f71ed45..bd3b984 100644
--- a/blueprint.yaml
+++ b/blueprint.yaml
@@ -1278,42 +1278,6 @@ trigger:
 
 action:
   - variables:
-      ##### Entity - Page Button - Toggle Entity #####
-      entity_short: >-
-        {%- if states(last_click) == "releasebuttonpage01button01" -%} {{ entity01 }}
-        {%- elif states(last_click) == "releasebuttonpage01button02" -%} {{ entity02 }}
-        {%- elif states(last_click) == "releasebuttonpage01button03" -%} {{ entity03 }}
-        {%- elif states(last_click) == "releasebuttonpage01button04" -%} {{ entity04 }}
-        {%- elif states(last_click) == "releasebuttonpage01button05" -%} {{ entity05 }}
-        {%- elif states(last_click) == "releasebuttonpage01button06" -%} {{ entity06 }}
-        {%- elif states(last_click) == "releasebuttonpage01button07" -%} {{ entity07 }}
-        {%- elif states(last_click) == "releasebuttonpage01button08" -%} {{ entity08 }}
-        {%- elif states(last_click) == "releasebuttonpage02button01" -%} {{ entity09 }}
-        {%- elif states(last_click) == "releasebuttonpage02button02" -%} {{ entity10 }}
-        {%- elif states(last_click) == "releasebuttonpage02button03" -%} {{ entity11 }}
-        {%- elif states(last_click) == "releasebuttonpage02button04" -%} {{ entity12 }}
-        {%- elif states(last_click) == "releasebuttonpage02button05" -%} {{ entity13 }}
-        {%- elif states(last_click) == "releasebuttonpage02button06" -%} {{ entity14 }}
-        {%- elif states(last_click) == "releasebuttonpage02button07" -%} {{ entity15 }}
-        {%- elif states(last_click) == "releasebuttonpage02button08" -%} {{ entity16 }}
-        {%- elif states(last_click) == "releasebuttonpage03button01" -%} {{ entity17 }}
-        {%- elif states(last_click) == "releasebuttonpage03button02" -%} {{ entity18 }}
-        {%- elif states(last_click) == "releasebuttonpage03button03" -%} {{ entity19 }}
-        {%- elif states(last_click) == "releasebuttonpage03button04" -%} {{ entity20 }}
-        {%- elif states(last_click) == "releasebuttonpage03button05" -%} {{ entity21 }}
-        {%- elif states(last_click) == "releasebuttonpage03button06" -%} {{ entity22 }}
-        {%- elif states(last_click) == "releasebuttonpage03button07" -%} {{ entity23 }}
-        {%- elif states(last_click) == "releasebuttonpage03button08" -%} {{ entity24 }}
-        {%- elif states(last_click) == "releasebuttonpage04button01" -%} {{ entity25 }}
-        {%- elif states(last_click) == "releasebuttonpage04button02" -%} {{ entity26 }}
-        {%- elif states(last_click) == "releasebuttonpage04button03" -%} {{ entity27 }}
-        {%- elif states(last_click) == "releasebuttonpage04button04" -%} {{ entity28 }}
-        {%- elif states(last_click) == "releasebuttonpage04button05" -%} {{ entity29 }}
-        {%- elif states(last_click) == "releasebuttonpage04button06" -%} {{ entity30 }}
-        {%- elif states(last_click) == "releasebuttonpage04button07" -%} {{ entity31 }}
-        {%- elif states(last_click) == "releasebuttonpage04button08" -%} {{ entity32 }}
-        {%- endif -%}
-
       ##### Entity - Page Lightsettings #####
       entity_long: >-
         {%- if states(last_click) == "pressbuttonpage01button01" -%} {{ entity01 }}
@@ -2377,6 +2341,42 @@ action:
           - condition: trigger
             id: short_press
         sequence:
+          - variables:
+              ##### Entity - Page Button - Toggle Entity #####
+              entity_short: >-
+                {%- if states(last_click) == "releasebuttonpage01button01" -%} {{ entity01 }}
+                {%- elif states(last_click) == "releasebuttonpage01button02" -%} {{ entity02 }}
+                {%- elif states(last_click) == "releasebuttonpage01button03" -%} {{ entity03 }}
+                {%- elif states(last_click) == "releasebuttonpage01button04" -%} {{ entity04 }}
+                {%- elif states(last_click) == "releasebuttonpage01button05" -%} {{ entity05 }}
+                {%- elif states(last_click) == "releasebuttonpage01button06" -%} {{ entity06 }}
+                {%- elif states(last_click) == "releasebuttonpage01button07" -%} {{ entity07 }}
+                {%- elif states(last_click) == "releasebuttonpage01button08" -%} {{ entity08 }}
+                {%- elif states(last_click) == "releasebuttonpage02button01" -%} {{ entity09 }}
+                {%- elif states(last_click) == "releasebuttonpage02button02" -%} {{ entity10 }}
+                {%- elif states(last_click) == "releasebuttonpage02button03" -%} {{ entity11 }}
+                {%- elif states(last_click) == "releasebuttonpage02button04" -%} {{ entity12 }}
+                {%- elif states(last_click) == "releasebuttonpage02button05" -%} {{ entity13 }}
+                {%- elif states(last_click) == "releasebuttonpage02button06" -%} {{ entity14 }}
+                {%- elif states(last_click) == "releasebuttonpage02button07" -%} {{ entity15 }}
+                {%- elif states(last_click) == "releasebuttonpage02button08" -%} {{ entity16 }}
+                {%- elif states(last_click) == "releasebuttonpage03button01" -%} {{ entity17 }}
+                {%- elif states(last_click) == "releasebuttonpage03button02" -%} {{ entity18 }}
+                {%- elif states(last_click) == "releasebuttonpage03button03" -%} {{ entity19 }}
+                {%- elif states(last_click) == "releasebuttonpage03button04" -%} {{ entity20 }}
+                {%- elif states(last_click) == "releasebuttonpage03button05" -%} {{ entity21 }}
+                {%- elif states(last_click) == "releasebuttonpage03button06" -%} {{ entity22 }}
+                {%- elif states(last_click) == "releasebuttonpage03button07" -%} {{ entity23 }}
+                {%- elif states(last_click) == "releasebuttonpage03button08" -%} {{ entity24 }}
+                {%- elif states(last_click) == "releasebuttonpage04button01" -%} {{ entity25 }}
+                {%- elif states(last_click) == "releasebuttonpage04button02" -%} {{ entity26 }}
+                {%- elif states(last_click) == "releasebuttonpage04button03" -%} {{ entity27 }}
+                {%- elif states(last_click) == "releasebuttonpage04button04" -%} {{ entity28 }}
+                {%- elif states(last_click) == "releasebuttonpage04button05" -%} {{ entity29 }}
+                {%- elif states(last_click) == "releasebuttonpage04button06" -%} {{ entity30 }}
+                {%- elif states(last_click) == "releasebuttonpage04button07" -%} {{ entity31 }}
+                {%- elif states(last_click) == "releasebuttonpage04button08" -%} {{ entity32 }}
+                {%- endif -%}
           - service: >-
               {% if entity_short is match 'light.' %}
               light.toggle