diff --git a/blueprint.yaml b/blueprint.yaml
index f0cae2f..8277e71 100644
--- a/blueprint.yaml
+++ b/blueprint.yaml
@@ -14,7 +14,7 @@ blueprint:
         text: {}
     language:
       name: Language for NSPanel (coming soon)
-      description: select your language for the values on the NSPanel display
+      description: select your language for the values on the NSPanel Display
       selector:
         select:
           options:
@@ -23,13 +23,13 @@ blueprint:
     tft_path:
       name: Nextion TFT File Folder for the service Folder Watcher
       description: 'TFT Path where the Nextion TFT File is stored (same NSPanel as **"last click"**) Example *"/config/www/nspanel/buero/nspanel_buero.tft"*'
-      default: /config/www/nspanel/buero/nspanel_buero.tft
+      default: []
       selector:
         text: {}
     delay:
       name: Delay to avoid sync problems  (coming soon)
-      description: When switching pages, synchronization problems may occur due to the network / WLAN. To avoid this problem enter your value for the delay (milliseconds)
-      default: []
+      description: Synchronization problems may occur due to the NETWORK / WLAN. To avoid this problem enter your value for the delay (milliseconds)
+      default: [10]
       selector:
         text: {}
     sync_value_ha:
@@ -103,6 +103,13 @@ blueprint:
             - switch
             - input_boolean
             - cover
+
+    left_button_name:
+      name: Name "Left Button" (Optional)
+      description: Left Button label - 10 characters are supported
+      default: []
+      selector:
+        text: {}
     right_button_entity:
       name: Right Button (Optional)
       description: Right Hardware Button - Select the entity that should be switched
@@ -114,6 +121,12 @@ blueprint:
             - switch
             - input_boolean
             - cover
+    right_button_name:
+      name: Name "Right Button" (Optional)
+      description: Right Button label - 10 characters are supported
+      default: []
+      selector:
+        text: {}
 
     ##### Button #####
     entity01:
@@ -686,32 +699,42 @@ trigger_variables:
   entity_long_trigger: "{{ entity_long }}"
 
 variables:
+  ##### GENERAL #####
   nspanel_name: !input "nspanel_name"
+  time: "{{ (as_timestamp(now()) | timestamp_custom('%H:%M')) }}"
+  weather: !input "weather"
+  language: !input "language"
+
+  ##### PUSH TO NEXTION DISPLAY #####
   command_text_printf: "esphome.{{ nspanel_name }}_send_command_text_printf"
   command_value: "esphome.{{ nspanel_name }}_send_command_value"
   command_printf: "esphome.{{ nspanel_name }}_send_command_printf"
   command_font_color: "esphome.{{ nspanel_name }}_send_command_font_color"
   command_background_color: "esphome.{{ nspanel_name }}_send_command_background_color"
-  tft_upload:  "esphome.{{ nspanel_name }}_upload_tft"
-  tft_path: !input "tft_path"
-  humidity: !input "humidity"
-  hotwatertemp: !input "hotwatertemp"
-  outdoortemp: !input "outdoortemp"
-  time: "{{ (as_timestamp(now()) | timestamp_custom('%H:%M')) }}"
-  weather: !input "weather"
-  language: !input "language"
-  left_button_entity: !input "left_button_entity"
-  right_button_entity: !input "right_button_entity"
 
-  # Sync Settings
+  ###### SYNC SETTINGS #####
   delay_boot: !input "delay"
   delay_value: !input "delay"
   delay_jump_page: !input "delay"
   sync_slider_ha: !input "sync_slider_ha"
   sync_value_ha: !input "sync_value_ha"
 
+  ##### TFT UPLOAD #####
+  tft_upload:  "esphome.{{ nspanel_name }}_upload_tft"
+  tft_path: !input "tft_path"
 
-  # Icons Mapping
+  ##### GENERAL ENTITYS #####
+  humidity: !input "humidity"
+  hotwatertemp: !input "hotwatertemp"
+  outdoortemp: !input "outdoortemp"
+
+  #### HARDWARE BUTTONS #####
+  left_button_entity: !input "left_button_entity"
+  left_button_name: !input "left_button_name"
+  right_button_entity: !input "right_button_entity"
+  right_button_name: !input "right_button_name"
+
+  ##### NEXTION PIC MAPPING #####
   cover_pic_closed: "106"
   cover_pic_open: "107"
   battery_icon: "108"
@@ -744,7 +767,7 @@ variables:
   weather_icon_lightning: "62"
   weather_icon_wind: "63"
 
-  # color for buttons
+  ###### NEXTION COLOR BUTTON DESIGN #####
   button_light_off: "90"
   button_light_on: "91"
   button_switch_off: "92"
@@ -754,42 +777,42 @@ variables:
   button_color_1: "65535"
   button_color_2: "10597"
 
-  ##### Date - DE #####
+  ##### DATE - DE #####
   date01_de: "{{ ((as_timestamp(now())) | timestamp_custom('%a %d.%m' )) | replace('Mon', 'Montag,')| replace('Tue', 'Dienstag,')| replace('Wed', 'Mittwoch,')| replace('Thu', 'Donnerstag,')| replace('Fri', 'Freitag,')| replace('Sat', 'Samstag,')| replace('Sun', 'Sonntag,') }}"
   date02_de: "{{ ((as_timestamp(now()) + 86400) | timestamp_custom('%a %d.%m' )) | replace('Mon', 'Montag,')| replace('Tue', 'Dienstag,')| replace('Wed', 'Mittwoch,')| replace('Thu', 'Donnerstag,')| replace('Fri', 'Freitag,')| replace('Sat', 'Samstag,')| replace('Sun', 'Sonntag,') }}"
   date03_de: "{{ ((as_timestamp(now()) + 172800) | timestamp_custom('%a %d.%m' )) | replace('Mon', 'Montag,')| replace('Tue', 'Dienstag,')| replace('Wed', 'Mittwoch,')| replace('Thu', 'Donnerstag,')| replace('Fri', 'Freitag,')| replace('Sat', 'Samstag,')| replace('Sun', 'Sonntag,') }}"
   date04_de: "{{ ((as_timestamp(now()) + 259200) | timestamp_custom('%a %d.%m' )) | replace('Mon', 'Montag,')| replace('Tue', 'Dienstag,')| replace('Wed', 'Mittwoch,')| replace('Thu', 'Donnerstag,')| replace('Fri', 'Freitag,')| replace('Sat', 'Samstag,')| replace('Sun', 'Sonntag,') }}"
   date05_de: "{{ ((as_timestamp(now()) + 345600) | timestamp_custom('%a %d.%m' )) | replace('Mon', 'Montag,')| replace('Tue', 'Dienstag,')| replace('Wed', 'Mittwoch,')| replace('Thu', 'Donnerstag,')| replace('Fri', 'Freitag,')| replace('Sat', 'Samstag,')| replace('Sun', 'Sonntag,') }}"
 
-  ##### Date - EN #####
+  ##### DATE - EN #####
   date01_en: "{{ ((as_timestamp(now())) | timestamp_custom('%a %d.%m' )) | replace('Mon', 'Monday,')| replace('Tue', 'Tuesday,')| replace('Wed', 'Wednesday,')| replace('Thu', 'Thursday,')| replace('Fri', 'Friday,')| replace('Sat', 'Saturday,')| replace('Sun', 'Sunday,') }}"
   date02_en: "{{ ((as_timestamp(now()) + 86400) | timestamp_custom('%a %d.%m' )) | replace('Mon', 'Monday,')| replace('Tue', 'Tuesday,')| replace('Wed', 'Wednesday,')| replace('Thu', 'Thursday,')| replace('Fri', 'Friday,')| replace('Sat', 'Saturday,')| replace('Sun', 'Sunday,') }}"
   date03_en: "{{ ((as_timestamp(now()) + 172800) | timestamp_custom('%a %d.%m' )) | replace('Mon', 'Monday,')| replace('Tue', 'Tuesday,')| replace('Wed', 'Wednesday,')| replace('Thu', 'Thursday,')| replace('Fri', 'Friday,')| replace('Sat', 'Saturday,')| replace('Sun', 'Sunday,') }}"
   date04_en: "{{ ((as_timestamp(now()) + 259200) | timestamp_custom('%a %d.%m' )) | replace('Mon', 'Monday,')| replace('Tue', 'Tuesday,')| replace('Wed', 'Wednesday,')| replace('Thu', 'Thursday,')| replace('Fri', 'Friday,')| replace('Sat', 'Saturday,')| replace('Sun', 'Sunday,') }}"
   date05_en: "{{ ((as_timestamp(now()) + 345600) | timestamp_custom('%a %d.%m' )) | replace('Mon', 'Monday,')| replace('Tue', 'Tuesday,')| replace('Wed', 'Wednesday,')| replace('Thu', 'Thursday,')| replace('Fri', 'Friday,')| replace('Sat', 'Saturday,')| replace('Sun', 'Sunday,') }}"
 
-  ##### Day - DE #####
+  ##### DAY WEATHER FORCAST - DE #####
   day01_de: "Heute"
   day02_de: "Morgen"
   day03_de: "in 2 Tagen"
   day04_de: "in 3 Tagen"
   day05_de: "in 4 tagen"
 
-  ##### Day - EN #####
+  ##### DAY WEATHER FORCAST - EN #####
   day01_en: "Today"
   day02_en: "Tomorrow"
   day03_en: "in 2 Days"
   day04_en: "in 3 Days"
   day05_en: "in 4 Days"
 
-  ##### Meteorologisk HA Default #####
+  ##### WEATHER INTEGRATION - METEOROLOGISK HA DEFAULT #####
   ha_weather: "weather.home"
 
-  ##### AccuWeather #####
+  ##### WEATHER INTEGRATION _ ACCUWEATHER  #####
   accuweather: !input "accuweather"
   accuweather_value: "weather.{{ accuweather }}"
 
-  ##### Forcast Day 0 Accuweather #####
+  ##### FORCAST ACCUWEATHER - DAY 0 #####
   accuweather_realfeel_temperature_min_0d: "sensor.{{ accuweather }}_realfeel_temperature_min_0d"
   accuweather_realfeel_temperature_max_0d: "sensor.{{ accuweather }}_realfeel_temperature_max_0d"
   accuweather_hours_of_sun_0d: "sensor.{{ accuweather }}_hours_of_sun_0d"
@@ -798,7 +821,7 @@ variables:
   accuweather_thunderstorm_probability_night_0d: "sensor.{{ accuweather }}_thunderstorm_probability_night_0d"
   accuweather_wind_day_0d: "sensor.{{ accuweather }}_wind_day_0d"
   accuweather_wind_night_0d: "sensor.{{ accuweather }}_wind_night_0d"
-  ##### Forcast Day 1 AccuWeather #####
+  ##### FORCAST ACCUWEATHER - DAY 1 #####
   accuweather_realfeel_temperature_min_1d: "sensor.{{ accuweather }}_realfeel_temperature_min_1d"
   accuweather_realfeel_temperature_max_1d: "sensor.{{ accuweather }}_realfeel_temperature_max_1d"
   accuweather_hours_of_sun_1d: "sensor.{{ accuweather }}_hours_of_sun_1d"
@@ -807,7 +830,7 @@ variables:
   accuweather_thunderstorm_probability_night_1d: "sensor.{{ accuweather }}_thunderstorm_probability_night_1d"
   accuweather_wind_day_1d: "sensor.{{ accuweather }}_wind_day_1d"
   accuweather_wind_night_1d: "sensor.{{ accuweather }}_wind_night_1d"
-  ##### Forcast Day 2 AccuWeather #####
+  ##### FORCAST ACCUWEATHER - DAY 2 #####
   accuweather_realfeel_temperature_min_2d: "sensor.{{ accuweather }}_realfeel_temperature_min_2d"
   accuweather_realfeel_temperature_max_2d: "sensor.{{ accuweather }}_realfeel_temperature_max_2d"
   accuweather_hours_of_sun_2d: "sensor.{{ accuweather }}_hours_of_sun_2d"
@@ -816,7 +839,7 @@ variables:
   accuweather_thunderstorm_probability_night_2d: "sensor.{{ accuweather }}_thunderstorm_probability_night_2d"
   accuweather_wind_day_2d: "sensor.{{ accuweather }}_wind_day_2d"
   accuweather_wind_night_2d: "sensor.{{ accuweather }}_wind_night_2d"
-  ##### Forcast Day 3 AccuWeather #####
+  ##### FORCAST ACCUWEATHER - DAY 3 #####
   accuweather_realfeel_temperature_min_3d: "sensor.{{ accuweather }}_realfeel_temperature_min_3d"
   accuweather_realfeel_temperature_max_3d: "sensor.{{ accuweather }}_realfeel_temperature_max_3d"
   accuweather_hours_of_sun_3d: "sensor.{{ accuweather }}_hours_of_sun_3d"
@@ -825,7 +848,7 @@ variables:
   accuweather_thunderstorm_probability_night_3d: "sensor.{{ accuweather }}_thunderstorm_probability_night_3d"
   accuweather_wind_day_3d: "sensor.{{ accuweather }}_wind_day_3d"
   accuweather_wind_night_3d: "sensor.{{ accuweather }}_wind_night_3d"
-  ##### Forcast Day 4 AccuWeather #####
+  ##### FORCAST ACCUWEATHER - DAY 4 #####
   accuweather_realfeel_temperature_min_4d: "sensor.{{ accuweather }}_realfeel_temperature_min_4d"
   accuweather_realfeel_temperature_max_4d: "sensor.{{ accuweather }}_realfeel_temperature_max_4d"
   accuweather_hours_of_sun_4d: "sensor.{{ accuweather }}_hours_of_sun_4d"
@@ -835,7 +858,7 @@ variables:
   accuweather_wind_day_4d: "sensor.{{ accuweather }}_wind_day_4d"
   accuweather_wind_night_4d: "sensor.{{ accuweather }}_wind_night_4d"
 
-  ##### Buttons #####
+  ##### BUTTONS 1- 32 #####
   entity01: !input "entity01"
   entity01_name: !input "entity01_name"
   entity02: !input "entity02"