diff --git a/blueprint.yaml b/blueprint.yaml
index 806011c..324b664 100644
--- a/blueprint.yaml
+++ b/blueprint.yaml
@@ -164,34 +164,6 @@ blueprint:
       selector:
         text: {}
 
-    ##### COLOR PICKER #####
-    color_picker01:
-      name: Color Picker 01
-      description: 'Fast color selection in the Lightsettings menu '
-      default: []
-      selector:
-        select:
-          mode: dropdown
-          multiple: true
-          options:
-            - yellow
-            - yellow-orange
-            - orange
-            - red
-            - red-violett
-            - violett
-            - blue-violett
-            - blue
-            - cyan
-            - turquoise
-            - green
-            - green-yellow
-            - cold-white
-            - white
-            - warm-white-light
-            - warm-white-middle
-            - warm-white-strong
-
     ##### BUTTONS #####
     entity01:
       name: Button 01 (Optional)
@@ -888,24 +860,6 @@ variables:
   page_buttonpage03: "buttonpage03"
   page_buttonpage04: "buttonpage04"
 
-  ##### COLOR PICKER COLOR MAPPING - color_name #####
-  yellow: "yellow"
-  yellow-orange: "gold"
-  orange: "orange"
-  red: "red"
-  red-violett: "magenta"
-  violett: "darkviolet"
-  blue-violett: "purple"
-  blue: "blue"
-  cyan: "cyan"
-  turquoise: "turquoise"
-  green: "green"
-  green-yellow: "greenyellow"
-  cold-white: "1"
-  white: "1"
-  warm-white-light: "1"
-  warm-white-middle: "1"
-  warm-white-strong: "1"
 
   ##### MUI Multilingual User Interface (DE/EN) #####
   date01_mui: >-
@@ -1835,17 +1789,21 @@ action:
                   message: "{{ left_button_name }}"
 
           ##### SET Left Hardware Button PIC on Home Page ####
-          - variables:
-              # Hardware Button PIC
-              left_hardware_button_state: >-
-                {%- if states(left_button_entity) == 'off' -%} {{ hardware_button_pic_off }}
-                {%- elif states(left_button_entity) == 'on' -%} {{ hardware_button_pic_on }}
-                {%- endif -%}
-          - delay:
-              milliseconds: "{{ delay_value }}"
-          - service: "{{ command_printf }}"
-            data:
-              cmd: home.left_bt_pic.pic={{ left_hardware_button_state }}
+          - if:
+              - condition: template
+                value_template: '{{ left_button_entity |length > 0 }}'
+            then:
+              - variables:
+                  # Hardware Button PIC
+                  left_hardware_button_state: >-
+                    {%- if states(left_button_entity) == 'off' -%} {{ hardware_button_pic_off }}
+                    {%- elif states(left_button_entity) == 'on' -%} {{ hardware_button_pic_on }}
+                    {%- endif -%}
+              - delay:
+                  milliseconds: "{{ delay_value }}"
+              - service: "{{ command_printf }}"
+                data:
+                  cmd: home.left_bt_pic.pic={{ left_hardware_button_state }}
 
           #####  NSPanel boot init - Right Button Name #####
           - if:
@@ -1860,17 +1818,21 @@ action:
                   message: "{{ right_button_name }}"
 
           ###### SET Right Hardware Button PIC on Home Page #####
-          - variables:
+          - if:
+              - condition: template
+                value_template: '{{ right_button_entity |length > 0 }}'
+            then:
+              - variables:
               # Hardware Button PIC
-              right_hardware_button_state: >-
-                {%- if states(right_button_entity) == 'off' -%} {{ hardware_button_pic_off }}
-                {%- elif states(right_button_entity) == 'on' -%} {{ hardware_button_pic_on }}
-                {%- endif -%}
-          - delay:
-              milliseconds: "{{ delay_value }}"
-          - service: "{{ command_printf }}"
-            data:
-              cmd: home.right_bt_pic.pic={{ right_hardware_button_state }}
+                  right_hardware_button_state: >-
+                    {%- if states(right_button_entity) == 'off' -%} {{ hardware_button_pic_off }}
+                    {%- elif states(right_button_entity) == 'on' -%} {{ hardware_button_pic_on }}
+                    {%- endif -%}
+              - delay:
+                  milliseconds: "{{ delay_value }}"
+              - service: "{{ command_printf }}"
+                data:
+                  cmd: home.right_bt_pic.pic={{ right_hardware_button_state }}
 
 
           ##### NSPanel boot init finished #####