diff --git a/blueprint.yaml b/blueprint.yaml
index c3a0916..4b508b5 100644
--- a/blueprint.yaml
+++ b/blueprint.yaml
@@ -101,6 +101,13 @@ blueprint:
         entity:
           domain:
             - sensor
+    climate:
+      name: Climate to control (Optional)
+      description: 'If an entity is selected, *"Thermostat Page"* is enabled'
+      default: []
+      selector:
+        entity:
+          domain: climate
     
     ##### HARDWARE BUTTONS #####
     left_button_entity:
@@ -764,6 +771,7 @@ variables:
   humidity: !input "humidity"
   hotwatertemp: !input "hotwatertemp"
   outdoortemp: !input "outdoortemp"
+  climate: !input "climate"
 
   #### HARDWARE BUTTONS #####
   left_button_entity: !input "left_button_entity"
@@ -818,6 +826,24 @@ variables:
   button_color_1: "65535"
   button_color_2: "10597"
 
+  ###### NEXTION PAGE MAPPING #####
+  page_home: 0
+  page_weather01: 1
+  page_weather02: 2
+  page_weather03: 3
+  page_weather04: 4
+  page_weather05: 5
+  page_climate: 6
+  page_settings: 7
+  page_boot: 8
+  page_screensaver: 9
+  page_lightsettings: 10
+  page_coversettings: 11
+  page_buttonpage01: 12
+  page_buttonpage02: 13
+  page_buttonpage03: 14
+  page_buttonpage04: 15
+
   ##### COLOR PICKER COLOR MAPPING - color_name #####
   yellow: "yellow"
   yellow-orange: "gold"
@@ -1081,7 +1107,10 @@ trigger:
       entity_id: !input "right_button_entity"
     id: right_button_state
 
-
+  #### Climate - Trigger ####
+  - platform: template
+    value_template: '{{ states(last_click) is match "releaseclimate" }}'
+    id: open_climate_settings
 
   ##### Trigger - Button General #################################################################################################################
 
@@ -1412,7 +1441,7 @@ action:
   # main - alias: "choose alias (name) - NEW VERSION"
   - choose:
 
-     ##### NSPanel boot init #####      DONE
+      ##### NSPanel boot init #####      DONE
       - conditions:
           - condition: trigger
             id: nspanel_boot_init
@@ -4412,6 +4441,21 @@ action:
                             data:
                               cmd: weather05.value05_pic.pic={{ weather_icon_wind }}
 
+  
+      ##### Open Climate Settings #####
+      - conditions:
+          - condition: trigger
+            id: open_climate_settings
+        sequence:
+          - if:
+              - condition: template
+                value_template: '{{ climate |length > 0 }}'         
+            then:
+              - service: "{{ command_printf }}"
+                data:
+                  cmd: "page {{ page_climate }}"
+
+
 #############################################################
 ##### CLOSE - Action #####
 #############################################################
\ No newline at end of file
diff --git a/nspanel.HMI b/nspanel.HMI
index da916fb..7722d72 100644
Binary files a/nspanel.HMI and b/nspanel.HMI differ
diff --git a/nspanel.tft b/nspanel.tft
index 28973d0..47db28f 100644
Binary files a/nspanel.tft and b/nspanel.tft differ