diff --git a/blueprint.yaml b/blueprint.yaml
index 7bba0fc..a2573d6 100644
--- a/blueprint.yaml
+++ b/blueprint.yaml
@@ -115,7 +115,7 @@ blueprint:
     entity01:
       name: Button 01 (Optional)
       description: Nextion Editor - *buttonpage01.button01*  **(ONLY light | switch | cover | input_boolean)**
-      default: switch.default_change_me
+      default: []
       selector:
         entity:
           domain:
@@ -132,7 +132,7 @@ blueprint:
     entity02:
       name: Button 02 (Optional)
       description: Nextion Editor - *buttonpage01.button02*  **(ONLY light | switch | cover | input_boolean)**
-      default: switch.default_change_me
+      default: []
       selector:
         entity:
           domain:
@@ -149,7 +149,7 @@ blueprint:
     entity03:
       name: Button 03 (Optional)
       description: Nextion Editor - *buttonpage01.button03*  **(ONLY light | switch | cover | input_boolean)**
-      default: switch.default_change_me
+      default: []
       selector:
         entity:
           domain:
@@ -166,7 +166,7 @@ blueprint:
     entity04:
       name: Button 04 (Optional)
       description: Nextion Editor - *buttonpage01.button04*  **(ONLY light | switch | cover | input_boolean)**
-      default: switch.default_change_me
+      default: []
       selector:
         entity:
           domain:
@@ -183,7 +183,7 @@ blueprint:
     entity05:
       name: Button 05 (Optional)
       description: Nextion Editor - *buttonpage01.button05*  **(ONLY light | switch | cover | input_boolean)**
-      default: switch.default_change_me
+      default: []
       selector:
         entity:
           domain:
@@ -200,7 +200,7 @@ blueprint:
     entity06:
       name: Button 06 (Optional)
       description: Nextion Editor - *buttonpage01.button06*  **(ONLY light | switch | cover | input_boolean)**
-      default: switch.default_change_me
+      default: []
       selector:
         entity:
           domain:
@@ -217,7 +217,7 @@ blueprint:
     entity07:
       name: Button 07 (Optional)
       description: Nextion Editor - *buttonpage01.button07*  **(ONLY light | switch | cover | input_boolean)**
-      default: switch.default_change_me
+      default: []
       selector:
         entity:
           domain:
@@ -234,7 +234,7 @@ blueprint:
     entity08:
       name: Button 08 (Optional)
       description: Nextion Editor - *buttonpage01.button08*  **(ONLY light | switch | cover | input_boolean)**
-      default: switch.default_change_me
+      default: []
       selector:
         entity:
           domain:
@@ -251,7 +251,7 @@ blueprint:
     entity09:
       name: Button 09 (Optional)
       description: Nextion Editor - *buttonpage02.button01*  **(ONLY light | switch | cover | input_boolean)**
-      default: switch.default_change_me
+      default: []
       selector:
         entity:
           domain:
@@ -268,7 +268,7 @@ blueprint:
     entity10:
       name: Button 10 (Optional)
       description: Nextion Editor - *buttonpage02.button02*  **(ONLY light | switch | cover | input_boolean)**
-      default: switch.default_change_me
+      default: []
       selector:
         entity:
           domain:
@@ -285,7 +285,7 @@ blueprint:
     entity11:
       name: Button 11 (Optional)
       description: Nextion Editor - *buttonpage02.button03*  **(ONLY light | switch | cover | input_boolean)**
-      default: switch.default_change_me
+      default: []
       selector:
         entity:
           domain:
@@ -302,7 +302,7 @@ blueprint:
     entity12:
       name: Button 12 (Optional)
       description: Nextion Editor - *buttonpage02.button04*  **(ONLY light | switch | cover | input_boolean)**
-      default: switch.default_change_me
+      default: []
       selector:
         entity:
           domain:
@@ -319,7 +319,7 @@ blueprint:
     entity13:
       name: Button 13 (Optional)
       description: Nextion Editor - *buttonpage01.button05*  **(ONLY light | switch | cover | input_boolean)**
-      default: switch.default_change_me
+      default: []
       selector:
         entity:
           domain:
@@ -336,7 +336,7 @@ blueprint:
     entity14:
       name: Button 14 (Optional)
       description: Nextion Editor - *buttonpage02.button06*  **(ONLY light | switch | cover | input_boolean)**
-      default: switch.default_change_me
+      default: []
       selector:
         entity:
           domain:
@@ -353,7 +353,7 @@ blueprint:
     entity15:
       name: Button 15 (Optional)
       description: Nextion Editor - *buttonpage02.button07*  **(ONLY light | switch | cover | input_boolean)**
-      default: switch.default_change_me
+      default: []
       selector:
         entity:
           domain:
@@ -370,7 +370,7 @@ blueprint:
     entity16:
       name: Button 16 (Optional)
       description: Nextion Editor - *buttonpage02.button08*  **(ONLY light | switch | cover | input_boolean)**
-      default: switch.default_change_me
+      default: []
       selector:
         entity:
           domain:
@@ -387,7 +387,7 @@ blueprint:
     entity17:
       name: Button 17 (Optional)
       description: Nextion Editor - *buttonpage03.button01*  **(ONLY light | switch | cover | input_boolean)**
-      default: switch.default_change_me
+      default: []
       selector:
         entity:
           domain:
@@ -404,7 +404,7 @@ blueprint:
     entity18:
       name: Button 18 (Optional)
       description: Nextion Editor - *buttonpage03.button02*  **(ONLY light | switch | cover | input_boolean)**
-      default: switch.default_change_me
+      default: []
       selector:
         entity:
           domain:
@@ -421,7 +421,7 @@ blueprint:
     entity19:
       name: Button 19 (Optional)
       description: Nextion Editor - *buttonpage03.button03*  **(ONLY light | switch | cover | input_boolean)**
-      default: switch.default_change_me
+      default: []
       selector:
         entity:
           domain:
@@ -438,7 +438,7 @@ blueprint:
     entity20:
       name: Button 20 (Optional)
       description: Nextion Editor - *buttonpage03.button04*  **(ONLY light | switch | cover | input_boolean)**
-      default: switch.default_change_me
+      default: []
       selector:
         entity:
           domain:
@@ -455,7 +455,7 @@ blueprint:
     entity21:
       name: Button 21 (Optional)
       description: Nextion Editor - *buttonpage03.button05*  **(ONLY light | switch | cover | input_boolean)**
-      default: switch.default_change_me
+      default: []
       selector:
         entity:
           domain:
@@ -472,7 +472,7 @@ blueprint:
     entity22:
       name: Button 22 (Optional)
       description: Nextion Editor - *buttonpage03.button06*  **(ONLY light | switch | cover | input_boolean)**
-      default: switch.default_change_me
+      default: []
       selector:
         entity:
           domain:
@@ -489,7 +489,7 @@ blueprint:
     entity23:
       name: Button 23 (Optional)
       description: Nextion Editor - *buttonpage03.button07*  **(ONLY light | switch | cover | input_boolean)**
-      default: switch.default_change_me
+      default: []
       selector:
         entity:
           domain:
@@ -506,7 +506,7 @@ blueprint:
     entity24:
       name: Button 24 (Optional)
       description: Nextion Editor - *buttonpage03.button08*  **(ONLY light | switch | cover | input_boolean)**
-      default: switch.default_change_me
+      default: []
       selector:
         entity:
           domain:
@@ -523,7 +523,7 @@ blueprint:
     entity25:
       name: Button 25 (Optional)
       description: Nextion Editor - *buttonpage04.button01*  **(ONLY light | switch | cover | input_boolean)**
-      default: switch.default_change_me
+      default: []
       selector:
         entity:
           domain:
@@ -540,7 +540,7 @@ blueprint:
     entity26:
       name: Button 26 (Optional)
       description: Nextion Editor - *buttonpage04.button02*  **(ONLY light | switch | cover | input_boolean)**
-      default: switch.default_change_me
+      default: []
       selector:
         entity:
           domain:
@@ -557,7 +557,7 @@ blueprint:
     entity27:
       name: Button 27 (Optional)
       description: Nextion Editor - *buttonpage04.button03*  **(ONLY light | switch | cover | input_boolean)**
-      default: switch.default_change_me
+      default: []
       selector:
         entity:
           domain:
@@ -574,7 +574,7 @@ blueprint:
     entity28:
       name: Button 28 (Optional)
       description: Nextion Editor - *buttonpage04.button04*  **(ONLY light | switch | cover | input_boolean)**
-      default: switch.default_change_me
+      default: []
       selector:
         entity:
           domain:
@@ -591,7 +591,7 @@ blueprint:
     entity29:
       name: Button 29 (Optional)
       description: Nextion Editor - *buttonpage04.button05*  **(ONLY light | switch | cover | input_boolean)**
-      default: switch.default_change_me
+      default: []
       selector:
         entity:
           domain:
@@ -608,7 +608,7 @@ blueprint:
     entity30:
       name: Button 30 (Optional)
       description: Nextion Editor - *buttonpage04.button06*  **(ONLY light | switch | cover | input_boolean)**
-      default: switch.default_change_me
+      default: []
       selector:
         entity:
           domain:
@@ -625,7 +625,7 @@ blueprint:
     entity31:
       name: Button 31 (Optional)
       description: Nextion Editor - *buttonpage04.button07*  **(ONLY light | switch | cover | input_boolean)**
-      default: switch.default_change_me
+      default: []
       selector:
         entity:
           domain:
@@ -642,7 +642,7 @@ blueprint:
     entity32:
       name: Button 32 (Optional)
       description: Nextion Editor - *buttonpage04.button08*  **(ONLY light | switch | cover | input_boolean)**
-      default: switch.default_change_me
+      default: []
       selector:
         entity:
           domain:
@@ -1074,201 +1074,166 @@ trigger:
     id: right_button_press
 
   ##### Button Sync Trigger #################################################################################################################
+  
+  ##### Button01 Sync - Trigger #####
   - platform: state
-    entity_id:
-      - !input 'entity01'
-      - !input 'entity02'
-      - !input 'entity03'
-      - !input 'entity04'
-      - !input 'entity05'
-      - !input 'entity06'
-      - !input 'entity07'
-      - !input 'entity08'
-      - !input 'entity09'
-      - !input 'entity10'
-      - !input 'entity11'
-      - !input 'entity12'
-      - !input 'entity13'
-      - !input 'entity14'
-      - !input 'entity15'
-      - !input 'entity16'
-      - !input 'entity17'
-      - !input 'entity18'
-      - !input 'entity19'
-      - !input 'entity20'
-      - !input 'entity21'
-      - !input 'entity22'
-      - !input 'entity23'
-      - !input 'entity24'
-      - !input 'entity25'
-      - !input 'entity26'
-      - !input 'entity27'
-      - !input 'entity28'
-      - !input 'entity29'
-      - !input 'entity30'
-      - !input 'entity31'
-      - !input 'entity32'
-    id: state_change_of_entity
+    entity_id: !input "entity01"
+    id: current_state_entity01
 
-  # ##### Button01 Sync - Trigger #####
-  # - platform: state
-  #   entity_id: !input "entity01"
-  #   id: current_state_entity01
+  ##### Button02 Sync - Trigger #####
+  - platform: state
+    entity_id: !input "entity02"
+    id: current_state_entity02
 
-  # ##### Button02 Sync - Trigger #####
-  # - platform: state
-  #   entity_id: !input "entity02"
-  #   id: current_state_entity02
+  ##### Button03 Sync - Trigger #####
+  - platform: state
+    entity_id: !input "entity03"
+    id: current_state_entity03
 
-  # ##### Button03 Sync - Trigger #####
-  # - platform: state
-  #   entity_id: !input "entity03"
-  #   id: current_state_entity03
+  ##### Button04 Sync - Trigger #####
+  - platform: state
+    entity_id: !input "entity04"
+    id: current_state_entity04
 
-  # ##### Button04 Sync - Trigger #####
-  # - platform: state
-  #   entity_id: !input "entity04"
-  #   id: current_state_entity04
+  ##### Button05 Sync - Trigger #####
+  - platform: state
+    entity_id: !input "entity05"
+    id: current_state_entity05
 
-  # ##### Button05 Sync - Trigger #####
-  # - platform: state
-  #   entity_id: !input "entity05"
-  #   id: current_state_entity05
+  ##### Button06 Sync - Trigger #####
+  - platform: state
+    entity_id: !input "entity06"
+    id: current_state_entity06
 
-  # ##### Button06 Sync - Trigger #####
-  # - platform: state
-  #   entity_id: !input "entity06"
-  #   id: current_state_entity06
+  ##### Button07 Sync - Trigger #####
+  - platform: state
+    entity_id: !input "entity07"
+    id: current_state_entity07
 
-  # ##### Button07 Sync - Trigger #####
-  # - platform: state
-  #   entity_id: !input "entity07"
-  #   id: current_state_entity07
+  ##### Button08 Sync - Trigger #####
+  - platform: state
+    entity_id: !input "entity08"
+    id: current_state_entity08
 
-  # ##### Button08 Sync - Trigger #####
-  # - platform: state
-  #   entity_id: !input "entity08"
-  #   id: current_state_entity08
+  ##### Button09 Sync - Trigger #####
+  - platform: state
+    entity_id: !input "entity09"
+    id: current_state_entity09
 
-  # ##### Button09 Sync - Trigger #####
-  # - platform: state
-  #   entity_id: !input "entity09"
-  #   id: current_state_entity09
+  ##### Button10 Sync - Trigger #####
+  - platform: state
+    entity_id: !input "entity10"
+    id: current_state_entity10
 
-  # ##### Button10 Sync - Trigger #####
-  # - platform: state
-  #   entity_id: !input "entity10"
-  #   id: current_state_entity10
+  ##### Button11 Sync - Trigger #####
+  - platform: state
+    entity_id: !input "entity11"
+    id: current_state_entity11
 
-  # ##### Button11 Sync - Trigger #####
-  # - platform: state
-  #   entity_id: !input "entity11"
-  #   id: current_state_entity11
+  ##### Button12 Sync - Trigger #####
+  - platform: state
+    entity_id: !input "entity12"
+    id: current_state_entity12
 
-  # ##### Button12 Sync - Trigger #####
-  # - platform: state
-  #   entity_id: !input "entity12"
-  #   id: current_state_entity12
+  ##### Button13 Sync - Trigger #####
+  - platform: state
+    entity_id: !input "entity13"
+    id: current_state_entity13
 
-  # ##### Button13 Sync - Trigger #####
-  # - platform: state
-  #   entity_id: !input "entity13"
-  #   id: current_state_entity13
+  ##### Button14 Sync - Trigger #####
+  - platform: state
+    entity_id: !input "entity14"
+    id: current_state_entity14
 
-  # ##### Button14 Sync - Trigger #####
-  # - platform: state
-  #   entity_id: !input "entity14"
-  #   id: current_state_entity14
+  ##### Button15 Sync - Trigger #####
+  - platform: state
+    entity_id: !input "entity15"
+    id: current_state_entity15
 
-  # ##### Button15 Sync - Trigger #####
-  # - platform: state
-  #   entity_id: !input "entity15"
-  #   id: current_state_entity15
+  ##### Button16 Sync - Trigger #####
+  - platform: state
+    entity_id: !input "entity16"
+    id: current_state_entity16
 
-  # ##### Button16 Sync - Trigger #####
-  # - platform: state
-  #   entity_id: !input "entity16"
-  #   id: current_state_entity16
+  ##### Button17 Sync - Trigger #####
+  - platform: state
+    entity_id: !input "entity17"
+    id: current_state_entity17
 
-  # ##### Button17 Sync - Trigger #####
-  # - platform: state
-  #   entity_id: !input "entity17"
-  #   id: current_state_entity17
+  ##### Button18 Sync - Trigger #####
+  - platform: state
+    entity_id: !input "entity18"
+    id: current_state_entity18
 
-  # ##### Button18 Sync - Trigger #####
-  # - platform: state
-  #   entity_id: !input "entity18"
-  #   id: current_state_entity18
+  ##### Button19 Sync - Trigger #####
+  - platform: state
+    entity_id: !input "entity19"
+    id: current_state_entity19
 
-  # ##### Button19 Sync - Trigger #####
-  # - platform: state
-  #   entity_id: !input "entity19"
-  #   id: current_state_entity19
+  ##### Button20 Sync - Trigger #####
+  - platform: state
+    entity_id: !input "entity20"
+    id: current_state_entity20
 
-  # ##### Button20 Sync - Trigger #####
-  # - platform: state
-  #   entity_id: !input "entity20"
-  #   id: current_state_entity20
+  ##### Button21 Sync - Trigger #####
+  - platform: state
+    entity_id: !input "entity21"
+    id: current_state_entity21
 
-  # ##### Button21 Sync - Trigger #####
-  # - platform: state
-  #   entity_id: !input "entity21"
-  #   id: current_state_entity21
+  ##### Button22 Sync - Trigger #####
+  - platform: state
+    entity_id: !input "entity22"
+    id: current_state_entity22
 
-  # ##### Button22 Sync - Trigger #####
-  # - platform: state
-  #   entity_id: !input "entity22"
-  #   id: current_state_entity22
+  ##### Button23 Sync - Trigger #####
+  - platform: state
+    entity_id: !input "entity23"
+    id: current_state_entity23
 
-  # ##### Button23 Sync - Trigger #####
-  # - platform: state
-  #   entity_id: !input "entity23"
-  #   id: current_state_entity23
+  ##### Button24 Sync - Trigger #####
+  - platform: state
+    entity_id: !input "entity24"
+    id: current_state_entity24
 
-  # ##### Button24 Sync - Trigger #####
-  # - platform: state
-  #   entity_id: !input "entity24"
-  #   id: current_state_entity24
+  ##### Button25 Sync - Trigger #####
+  - platform: state
+    entity_id: !input "entity25"
+    id: current_state_entity25
 
-  # ##### Button25 Sync - Trigger #####
-  # - platform: state
-  #   entity_id: !input "entity25"
-  #   id: current_state_entity25
+  ##### Button26 Sync - Trigger #####
+  - platform: state
+    entity_id: !input "entity26"
+    id: current_state_entity26
 
-  # ##### Button26 Sync - Trigger #####
-  # - platform: state
-  #   entity_id: !input "entity26"
-  #   id: current_state_entity26
+  ##### Button27 Sync - Trigger #####
+  - platform: state
+    entity_id: !input "entity27"
+    id: current_state_entity27
 
-  # ##### Button27 Sync - Trigger #####
-  # - platform: state
-  #   entity_id: !input "entity27"
-  #   id: current_state_entity27
+  ##### Button28 Sync - Trigger #####
+  - platform: state
+    entity_id: !input "entity28"
+    id: current_state_entity28
 
-  # ##### Button28 Sync - Trigger #####
-  # - platform: state
-  #   entity_id: !input "entity28"
-  #   id: current_state_entity28
+  ##### Button29 Sync - Trigger #####
+  - platform: state
+    entity_id: !input "entity29"
+    id: current_state_entity29
 
-  # ##### Button29 Sync - Trigger #####
-  # - platform: state
-  #   entity_id: !input "entity29"
-  #   id: current_state_entity29
+  ##### Button30 Sync - Trigger #####
+  - platform: state
+    entity_id: !input "entity30"
+    id: current_state_entity30
 
-  # ##### Button30 Sync - Trigger #####
-  # - platform: state
-  #   entity_id: !input "entity30"
-  #   id: current_state_entity30
+  ##### Button31 Sync - Trigger #####
+  - platform: state
+    entity_id: !input "entity31"
+    id: current_state_entity31
 
-  # ##### Button31 Sync - Trigger #####
-  # - platform: state
-  #   entity_id: !input "entity31"
-  #   id: current_state_entity31
-
-  # ##### Button32 Sync - Trigger #####
-  # - platform: state
-  #   entity_id: !input "entity32"
-  #   id: current_state_entity32
+  ##### Button32 Sync - Trigger #####
+  - platform: state
+    entity_id: !input "entity32"
+    id: current_state_entity32
 
 #########################################
 #
@@ -1442,7 +1407,39 @@ action:
       #### Update button on entity state_change ####
       - conditions:
           - condition: trigger
-            id: state_change_of_entity
+            id:
+              - current_state_entity01
+              - current_state_entity02
+              - current_state_entity03
+              - current_state_entity04
+              - current_state_entity05
+              - current_state_entity06
+              - current_state_entity07
+              - current_state_entity08
+              - current_state_entity09
+              - current_state_entity10
+              - current_state_entity11
+              - current_state_entity12
+              - current_state_entity13
+              - current_state_entity14
+              - current_state_entity15
+              - current_state_entity16
+              - current_state_entity17
+              - current_state_entity18
+              - current_state_entity19
+              - current_state_entity20
+              - current_state_entity21
+              - current_state_entity22
+              - current_state_entity23
+              - current_state_entity24
+              - current_state_entity25
+              - current_state_entity26
+              - current_state_entity27
+              - current_state_entity28
+              - current_state_entity29
+              - current_state_entity30
+              - current_state_entity31
+              - current_state_entity32
         sequence:
           - alias: "Set variable(s) for entity change"
             variables:
@@ -2557,7 +2554,7 @@ action:
           - condition: trigger
             id:
               - nspanel_boot_buttonpage01
-              - current_state_entity01
+              # - current_state_entity01
         sequence:
           ##### buttonpage01.button01 Design Light OFF #####
           - if:
@@ -2881,7 +2878,7 @@ action:
           - condition: trigger
             id:
               - nspanel_boot_buttonpage01
-              - current_state_entity02
+              # - current_state_entity02
         sequence:
           - if:
               - condition: template
@@ -3199,7 +3196,7 @@ action:
           - condition: trigger
             id:
               - nspanel_boot_buttonpage01
-              - current_state_entity03
+              # - current_state_entity03
         sequence:
           - if:
               - condition: template
@@ -3517,7 +3514,7 @@ action:
           - condition: trigger
             id:
               - nspanel_boot_buttonpage01
-              - current_state_entity04
+              # - current_state_entity04
         sequence:
           - if:
               - condition: template
@@ -3835,7 +3832,7 @@ action:
           - condition: trigger
             id:
               - nspanel_boot_buttonpage01
-              - current_state_entity05
+              # - current_state_entity05
         sequence:
           - if:
               - condition: template
@@ -4153,7 +4150,7 @@ action:
           - condition: trigger
             id:
               - nspanel_boot_buttonpage01
-              - current_state_entity06
+              # - current_state_entity06
         sequence:
           - if:
               - condition: template
@@ -4471,7 +4468,7 @@ action:
           - condition: trigger
             id:
               - nspanel_boot_buttonpage01
-              - current_state_entity07
+              # - current_state_entity07
         sequence:
           - if:
               - condition: template
@@ -4789,7 +4786,7 @@ action:
           - condition: trigger
             id:
               - nspanel_boot_buttonpage01
-              - current_state_entity08
+              # - current_state_entity08
         sequence:
           - if:
               - condition: template
@@ -5109,7 +5106,7 @@ action:
           - condition: trigger
             id:
               - nspanel_boot_buttonpage02
-              - current_state_entity09
+              # - current_state_entity09
         sequence:
           - if:
               - condition: template
@@ -5427,7 +5424,7 @@ action:
           - condition: trigger
             id:
               - nspanel_boot_buttonpage02
-              - current_state_entity10
+              # - current_state_entity10
         sequence:
           - if:
               - condition: template
@@ -5745,7 +5742,7 @@ action:
           - condition: trigger
             id:
               - nspanel_boot_buttonpage02
-              - current_state_entity11
+              # - current_state_entity11
         sequence:
           - if:
               - condition: template
@@ -6063,7 +6060,7 @@ action:
           - condition: trigger
             id:
               - nspanel_boot_buttonpage02
-              - current_state_entity12
+              # - current_state_entity12
         sequence:
           - if:
               - condition: template
@@ -6381,7 +6378,7 @@ action:
           - condition: trigger
             id:
               - nspanel_boot_buttonpage02
-              - current_state_entity13
+              # - current_state_entity13
         sequence:
           - if:
               - condition: template
@@ -6699,7 +6696,7 @@ action:
           - condition: trigger
             id:
               - nspanel_boot_buttonpage02
-              - current_state_entity14
+              # - current_state_entity14
         sequence:
           - if:
               - condition: template
@@ -7017,7 +7014,7 @@ action:
           - condition: trigger
             id:
               - nspanel_boot_buttonpage02
-              - current_state_entity15
+              # - current_state_entity15
         sequence:
           - if:
               - condition: template
@@ -7335,7 +7332,7 @@ action:
           - condition: trigger
             id:
               - nspanel_boot_buttonpage02
-              - current_state_entity16
+              # - current_state_entity16
         sequence:
           - if:
               - condition: template
@@ -7655,7 +7652,7 @@ action:
           - condition: trigger
             id:
               - nspanel_boot_buttonpage03
-              - current_state_entity17
+              # - current_state_entity17
         sequence:
           - if:
               - condition: template
@@ -7973,7 +7970,7 @@ action:
           - condition: trigger
             id:
               - nspanel_boot_buttonpage03
-              - current_state_entity18
+              # - current_state_entity18
         sequence:
           - if:
               - condition: template
@@ -8291,7 +8288,7 @@ action:
           - condition: trigger
             id:
               - nspanel_boot_buttonpage03
-              - current_state_entity19
+              # - current_state_entity19
         sequence:
           - if:
               - condition: template
@@ -8609,7 +8606,7 @@ action:
           - condition: trigger
             id:
               - nspanel_boot_buttonpage03
-              - current_state_entity20
+              # - current_state_entity20
         sequence:
           - if:
               - condition: template
@@ -8927,7 +8924,7 @@ action:
           - condition: trigger
             id:
               - nspanel_boot_buttonpage03
-              - current_state_entity21
+              # - current_state_entity21
         sequence:
           - if:
               - condition: template
@@ -9245,7 +9242,7 @@ action:
           - condition: trigger
             id:
               - nspanel_boot_buttonpage03
-              - current_state_entity22
+              # - current_state_entity22
         sequence:
           - if:
               - condition: template
@@ -9563,7 +9560,7 @@ action:
           - condition: trigger
             id:
               - nspanel_boot_buttonpage03
-              - current_state_entity23
+              # - current_state_entity23
         sequence:
           - if:
               - condition: template
@@ -9881,7 +9878,7 @@ action:
           - condition: trigger
             id:
               - nspanel_boot_buttonpage03
-              - current_state_entity24
+              # - current_state_entity24
         sequence:
           - if:
               - condition: template
@@ -10201,7 +10198,7 @@ action:
           - condition: trigger
             id:
               - nspanel_boot_buttonpage04
-              - current_state_entity25
+              # - current_state_entity25
         sequence:
           - if:
               - condition: template
@@ -10519,7 +10516,7 @@ action:
           - condition: trigger
             id:
               - nspanel_boot_buttonpage04
-              - current_state_entity26
+              # - current_state_entity26
         sequence:
           - if:
               - condition: template
@@ -10837,7 +10834,7 @@ action:
           - condition: trigger
             id:
               - nspanel_boot_buttonpage04
-              - current_state_entity27
+              # - current_state_entity27
         sequence:
           - if:
               - condition: template
@@ -11155,7 +11152,7 @@ action:
           - condition: trigger
             id:
               - nspanel_boot_buttonpage04
-              - current_state_entity28
+              # - current_state_entity28
         sequence:
           - if:
               - condition: template
@@ -11473,7 +11470,7 @@ action:
           - condition: trigger
             id:
               - nspanel_boot_buttonpage04
-              - current_state_entity29
+              # - current_state_entity29
         sequence:
           - if:
               - condition: template
@@ -11791,7 +11788,7 @@ action:
           - condition: trigger
             id:
               - nspanel_boot_buttonpage04
-              - current_state_entity30
+              # - current_state_entity30
         sequence:
           - if:
               - condition: template
@@ -12109,7 +12106,7 @@ action:
           - condition: trigger
             id:
               - nspanel_boot_buttonpage04
-              - current_state_entity31
+              # - current_state_entity31
         sequence:
           - if:
               - condition: template
@@ -12427,7 +12424,7 @@ action:
           - condition: trigger
             id:
               - nspanel_boot_buttonpage04
-              - current_state_entity32
+              # - current_state_entity32
         sequence:
           - if:
               - condition: template