diff --git a/nspanel_blueprint.yaml b/nspanel_blueprint.yaml
index b39c408..688a01d 100644
--- a/nspanel_blueprint.yaml
+++ b/nspanel_blueprint.yaml
@@ -35,7 +35,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
 🎉 Roadmap Roadmap can be found here [Roadmap](https://github.com/Blackymas/NSPanel_HA_Blueprint/labels/roadmap)
 
 
-ℹ️ Version: v.3.2.1
+ℹ️ Version: v.3.2.2
 
 '
 
@@ -2356,7 +2356,7 @@ trigger_variables:
 
 variables:
   ##### GENERAL #####
-  blueprint_version: "3.2.1"
+  blueprint_version: "3.2.2"
   language: !input "language"
   date_format: !input "date_format"
   time_format: !input "time_format"
@@ -4830,92 +4830,7 @@ action:
                                   {%- else -%} 0
                                   {%- endif -%}
 
-                            # ##### SET Buttons Background ####
-                            # #
-                            # ##### SET Button PIC #####
-                            # - service: "{{ command_printf }}"
-                            #   data:
-                            #     cmd: "{{ repeat.item.button }}pic.pic={{ btn_pic }}"
-                            # ##### SET ICON Background #####
-                            # - delay:
-                            #     milliseconds: "{{ delay_value }}"
-                            # - service: "{{ command_background_color }}"
-                            #   data:
-                            #     component: "{{ repeat.item.button }}icon"
-                            #     message: "{{ btn_bg }}"
-                            # ##### SET LABEL Background #####
-                            # - delay:
-                            #     milliseconds: "{{ delay_value }}"
-                            # - service: "{{ command_background_color }}"
-                            #   data:
-                            #     component: "{{ repeat.item.button }}text"
-                            #     message: "{{ btn_bg }}"
-                            # ##### SET BRIGHTNESS Background Color #####
-                            # - delay:
-                            #     milliseconds: "{{ delay_value }}"
-                            # - service: "{{ command_background_color }}"
-                            #   data:
-                            #     component: "{{ repeat.item.button }}bri"
-                            #     message: "{{ btn_bg }}"
-
-                            # ##### SET Buttons Font Color ####
-                            # #
-                            # ##### SET ICON Font Color #####
-                            # - delay:
-                            #     milliseconds: "{{ delay_value }}"
-                            # - service: "{{ command_font_color }}"
-                            #   data:
-                            #     component: "{{ repeat.item.button }}icon"
-                            #     message: "{{ btn_icon_font }}"
-                            # ##### SET LABEL Font Color #####
-                            # - delay:
-                            #     milliseconds: "{{ delay_value }}"
-                            # - service: "{{ command_font_color }}"
-                            #   data:
-                            #     component: "{{ repeat.item.button }}text"
-                            #     message: "{{ btn_txt_font }}"
-                            # ##### SET BRIGHTNESS Font Color #####
-                            # - delay:
-                            #     milliseconds: "{{ delay_value }}"
-                            # - service: "{{ command_font_color }}"
-                            #   data:
-                            #     component: "{{ repeat.item.button }}bri"
-                            #     message: "{{ btn_bri_font }}"
-
-                            # ##### SET Buttons Text Value ####
-                            # #
-                            # ##### "ICON" Value #####
-                            # - delay:
-                            #     milliseconds: "{{ delay_value }}"
-                            # - service: "{{ command_text_printf }}"
-                            #   data:
-                            #     component: "{{ repeat.item.button }}icon"
-                            #     message: "{{ btn_icon }}"
-                            # ##### "LABEL" Value #####
-                            # - delay:
-                            #     milliseconds: "{{ delay_value }}"
-                            # - service: "{{ command_text_printf }}"
-                            #   data:
-                            #     component: "{{ repeat.item.button }}text"
-                            #     message: "{{ btn_label }}"
-
-                            # ##### "BRIGHTNESS" Value #####
-                            # - delay:
-                            #     milliseconds: "{{ delay_value }}"
-                            # - if:
-                            #     - condition: template
-                            #       value_template: "{{ btn_bri_txt == 0 }}"
-                            #   then:
-                            #     - service: "{{ command_text_printf }}"
-                            #       data:
-                            #         component: "{{ repeat.item.button }}bri"
-                            #         message: " "
-                            #   else:
-                            #     - service: "{{ command_text_printf }}"
-                            #       data:
-                            #         component: "{{ repeat.item.button }}bri"
-                            #         message: "{{ btn_bri_txt }}"
-
+                            ##### Set buttton #####
                             - service: "{{ command_set_button }}"
                               data:
                                 btn_id: "{{ repeat.item.button }}"
@@ -5094,91 +5009,19 @@ action:
                                   {%- else -%} 0
                                   {%- endif -%}
 
-                            ##### SET Buttons Background ####
-                            #
-                            ##### SET Button PIC #####
-                            - service: "{{ command_printf }}"
+                            ##### Set buttton #####
+                            - service: "{{ command_set_button }}"
                               data:
-                                cmd: "{{ repeat.item.button }}pic.pic={{ btn_pic }}"
-                            ##### SET ICON Background #####
-                            - delay:
-                                milliseconds: "{{ delay_value }}"
-                            - service: "{{ command_background_color }}"
-                              data:
-                                component: "{{ repeat.item.button }}icon"
-                                message: "{{ btn_bg }}"
-                            ##### SET LABEL Background #####
-                            - delay:
-                                milliseconds: "{{ delay_value }}"
-                            - service: "{{ command_background_color }}"
-                              data:
-                                component: "{{ repeat.item.button }}text"
-                                message: "{{ btn_bg }}"
-                            ##### SET BRIGHTNESS Background Color #####
-                            - delay:
-                                milliseconds: "{{ delay_value }}"
-                            - service: "{{ command_background_color }}"
-                              data:
-                                component: "{{ repeat.item.button }}bri"
-                                message: "{{ btn_bg }}"
+                                btn_id: "{{ repeat.item.button }}"
+                                btn_pic: "{{ btn_pic }}"
+                                btn_bg: "{{ btn_bg }}"
+                                btn_icon_font: "{{ btn_icon_font }}"
+                                btn_txt_font: "{{ btn_txt_font }}"
+                                btn_bri_font: "{{ btn_bri_font }}"
+                                btn_icon: "{{ btn_icon }}"
+                                btn_label: "{{ btn_label }}"
+                                btn_bri_txt: "{{ btn_bri_txt }}"
 
-                            ##### SET Buttons Font Color ####
-                            #
-                            ##### SET ICON Font Color #####
-                            - delay:
-                                milliseconds: "{{ delay_value }}"
-                            - service: "{{ command_font_color }}"
-                              data:
-                                component: "{{ repeat.item.button }}icon"
-                                message: "{{ btn_icon_font }}"
-                            ##### SET LABEL Font Color #####
-                            - delay:
-                                milliseconds: "{{ delay_value }}"
-                            - service: "{{ command_font_color }}"
-                              data:
-                                component: "{{ repeat.item.button }}text"
-                                message: "{{ btn_txt_font }}"
-                            ##### SET BRIGHTNESS Font Color #####
-                            - delay:
-                                milliseconds: "{{ delay_value }}"
-                            - service: "{{ command_font_color }}"
-                              data:
-                                component: "{{ repeat.item.button }}bri"
-                                message: "{{ btn_bri_font }}"
-
-                            ##### SET Buttons Text Value ####
-                            #
-                            ##### "ICON" Value #####
-                            - delay:
-                                milliseconds: "{{ delay_value }}"
-                            - service: "{{ command_text_printf }}"
-                              data:
-                                component: "{{ repeat.item.button }}icon"
-                                message: "{{ btn_icon }}"
-                            ##### "LABEL" Value #####
-                            - delay:
-                                milliseconds: "{{ delay_value }}"
-                            - service: "{{ command_text_printf }}"
-                              data:
-                                component: "{{ repeat.item.button }}text"
-                                message: "{{ btn_label }}"
-
-                            ##### "BRIGHTNESS" Value #####
-                            - delay:
-                                milliseconds: "{{ delay_value }}"
-                            - if:
-                                - condition: template
-                                  value_template: "{{ btn_bri_txt == 0 }}"
-                              then:
-                                - service: "{{ command_text_printf }}"
-                                  data:
-                                    component: "{{ repeat.item.button }}bri"
-                                    message: " "
-                              else:
-                                - service: "{{ command_text_printf }}"
-                                  data:
-                                    component: "{{ repeat.item.button }}bri"
-                                    message: "{{ btn_bri_txt }}"
                   ###### SHOW All component when page loading done #####
                   - delay:
                       milliseconds: "{{ delay_value }}"
@@ -5345,91 +5188,19 @@ action:
                                   {%- else -%} 0
                                   {%- endif -%}
 
-                            ##### SET Buttons Background ####
-                            #
-                            ##### SET Button PIC #####
-                            - service: "{{ command_printf }}"
+                            ##### Set buttton #####
+                            - service: "{{ command_set_button }}"
                               data:
-                                cmd: "{{ repeat.item.button }}pic.pic={{ btn_pic }}"
-                            ##### SET ICON Background #####
-                            - delay:
-                                milliseconds: "{{ delay_value }}"
-                            - service: "{{ command_background_color }}"
-                              data:
-                                component: "{{ repeat.item.button }}icon"
-                                message: "{{ btn_bg }}"
-                            ##### SET LABEL Background #####
-                            - delay:
-                                milliseconds: "{{ delay_value }}"
-                            - service: "{{ command_background_color }}"
-                              data:
-                                component: "{{ repeat.item.button }}text"
-                                message: "{{ btn_bg }}"
-                            ##### SET BRIGHTNESS Background Color #####
-                            - delay:
-                                milliseconds: "{{ delay_value }}"
-                            - service: "{{ command_background_color }}"
-                              data:
-                                component: "{{ repeat.item.button }}bri"
-                                message: "{{ btn_bg }}"
+                                btn_id: "{{ repeat.item.button }}"
+                                btn_pic: "{{ btn_pic }}"
+                                btn_bg: "{{ btn_bg }}"
+                                btn_icon_font: "{{ btn_icon_font }}"
+                                btn_txt_font: "{{ btn_txt_font }}"
+                                btn_bri_font: "{{ btn_bri_font }}"
+                                btn_icon: "{{ btn_icon }}"
+                                btn_label: "{{ btn_label }}"
+                                btn_bri_txt: "{{ btn_bri_txt }}"
 
-                            ##### SET Buttons Font Color ####
-                            #
-                            ##### SET ICON Font Color #####
-                            - delay:
-                                milliseconds: "{{ delay_value }}"
-                            - service: "{{ command_font_color }}"
-                              data:
-                                component: "{{ repeat.item.button }}icon"
-                                message: "{{ btn_icon_font }}"
-                            ##### SET LABEL Font Color #####
-                            - delay:
-                                milliseconds: "{{ delay_value }}"
-                            - service: "{{ command_font_color }}"
-                              data:
-                                component: "{{ repeat.item.button }}text"
-                                message: "{{ btn_txt_font }}"
-                            ##### SET BRIGHTNESS Font Color #####
-                            - delay:
-                                milliseconds: "{{ delay_value }}"
-                            - service: "{{ command_font_color }}"
-                              data:
-                                component: "{{ repeat.item.button }}bri"
-                                message: "{{ btn_bri_font }}"
-
-                            ##### SET Buttons Text Value ####
-                            #
-                            ##### "ICON" Value #####
-                            - delay:
-                                milliseconds: "{{ delay_value }}"
-                            - service: "{{ command_text_printf }}"
-                              data:
-                                component: "{{ repeat.item.button }}icon"
-                                message: "{{ btn_icon }}"
-                            ##### "LABEL" Value #####
-                            - delay:
-                                milliseconds: "{{ delay_value }}"
-                            - service: "{{ command_text_printf }}"
-                              data:
-                                component: "{{ repeat.item.button }}text"
-                                message: "{{ btn_label }}"
-
-                            ##### "BRIGHTNESS" Value #####
-                            - delay:
-                                milliseconds: "{{ delay_value }}"
-                            - if:
-                                - condition: template
-                                  value_template: "{{ btn_bri_txt == 0 }}"
-                              then:
-                                - service: "{{ command_text_printf }}"
-                                  data:
-                                    component: "{{ repeat.item.button }}bri"
-                                    message: " "
-                              else:
-                                - service: "{{ command_text_printf }}"
-                                  data:
-                                    component: "{{ repeat.item.button }}bri"
-                                    message: "{{ btn_bri_txt }}"
                   ###### SHOW All component when page loading done #####
                   - delay:
                       milliseconds: "{{ delay_value }}"
@@ -5596,91 +5367,19 @@ action:
                                   {%- else -%} 0
                                   {%- endif -%}
 
-                            ##### SET Buttons Background ####
-                            #
-                            ##### SET Button PIC #####
-                            - service: "{{ command_printf }}"
+                            ##### Set buttton #####
+                            - service: "{{ command_set_button }}"
                               data:
-                                cmd: "{{ repeat.item.button }}pic.pic={{ btn_pic }}"
-                            ##### SET ICON Background #####
-                            - delay:
-                                milliseconds: "{{ delay_value }}"
-                            - service: "{{ command_background_color }}"
-                              data:
-                                component: "{{ repeat.item.button }}icon"
-                                message: "{{ btn_bg }}"
-                            ##### SET LABEL Background #####
-                            - delay:
-                                milliseconds: "{{ delay_value }}"
-                            - service: "{{ command_background_color }}"
-                              data:
-                                component: "{{ repeat.item.button }}text"
-                                message: "{{ btn_bg }}"
-                            ##### SET BRIGHTNESS Background Color #####
-                            - delay:
-                                milliseconds: "{{ delay_value }}"
-                            - service: "{{ command_background_color }}"
-                              data:
-                                component: "{{ repeat.item.button }}bri"
-                                message: "{{ btn_bg }}"
+                                btn_id: "{{ repeat.item.button }}"
+                                btn_pic: "{{ btn_pic }}"
+                                btn_bg: "{{ btn_bg }}"
+                                btn_icon_font: "{{ btn_icon_font }}"
+                                btn_txt_font: "{{ btn_txt_font }}"
+                                btn_bri_font: "{{ btn_bri_font }}"
+                                btn_icon: "{{ btn_icon }}"
+                                btn_label: "{{ btn_label }}"
+                                btn_bri_txt: "{{ btn_bri_txt }}"
 
-                            ##### SET Buttons Font Color ####
-                            #
-                            ##### SET ICON Font Color #####
-                            - delay:
-                                milliseconds: "{{ delay_value }}"
-                            - service: "{{ command_font_color }}"
-                              data:
-                                component: "{{ repeat.item.button }}icon"
-                                message: "{{ btn_icon_font }}"
-                            ##### SET LABEL Font Color #####
-                            - delay:
-                                milliseconds: "{{ delay_value }}"
-                            - service: "{{ command_font_color }}"
-                              data:
-                                component: "{{ repeat.item.button }}text"
-                                message: "{{ btn_txt_font }}"
-                            ##### SET BRIGHTNESS Font Color #####
-                            - delay:
-                                milliseconds: "{{ delay_value }}"
-                            - service: "{{ command_font_color }}"
-                              data:
-                                component: "{{ repeat.item.button }}bri"
-                                message: "{{ btn_bri_font }}"
-
-                            ##### SET Buttons Text Value ####
-                            #
-                            ##### "ICON" Value #####
-                            - delay:
-                                milliseconds: "{{ delay_value }}"
-                            - service: "{{ command_text_printf }}"
-                              data:
-                                component: "{{ repeat.item.button }}icon"
-                                message: "{{ btn_icon }}"
-                            ##### "LABEL" Value #####
-                            - delay:
-                                milliseconds: "{{ delay_value }}"
-                            - service: "{{ command_text_printf }}"
-                              data:
-                                component: "{{ repeat.item.button }}text"
-                                message: "{{ btn_label }}"
-
-                            ##### "BRIGHTNESS" Value #####
-                            - delay:
-                                milliseconds: "{{ delay_value }}"
-                            - if:
-                                - condition: template
-                                  value_template: "{{ btn_bri_txt == 0 }}"
-                              then:
-                                - service: "{{ command_text_printf }}"
-                                  data:
-                                    component: "{{ repeat.item.button }}bri"
-                                    message: " "
-                              else:
-                                - service: "{{ command_text_printf }}"
-                                  data:
-                                    component: "{{ repeat.item.button }}bri"
-                                    message: "{{ btn_bri_txt }}"
                   ###### SHOW All component when page loading done #####
                   - delay:
                       milliseconds: "{{ delay_value }}"