diff --git a/esphome.yaml b/esphome.yaml
index f4619e3..b47f6ee 100644
--- a/esphome.yaml
+++ b/esphome.yaml
@@ -461,7 +461,7 @@ sensor:
         - wait_until:
             switch.is_on: nextion_init
         - lambda: id(disp1).set_component_text_printf("home.current_temp", "%.1f°", id(temp_nspanel).state); # onboard temp (thermostat temp) to home page.
-        - lambda: id(disp1).set_component_text_printf("climate.a04", "%.1f", id(temp_nspanel).state);
+        - lambda: id(disp1).set_component_text_printf("climate.current_temp", "%.1f", id(temp_nspanel).state);
 
   ##### THERMOSTAT CLIMATE TARGET TEMPERATURE FROM HA #####
   # - platform: homeassistant
@@ -474,7 +474,7 @@ sensor:
   #       - globals.set:
   #           id: climate_target_temp_val_global
   #           value: !lambda 'return float(x);'
-  #       - lambda: id(disp1).set_component_text_printf("climate.a05", "%.1f", id(climate_target_temp_val_global));
+  #       - lambda: id(disp1).set_component_text_printf("climate.target_temp", "%.1f", id(climate_target_temp_val_global));
   #         # THERMO PROGRESS CIRCLE, broken into 3 images to create space for the temperatures in the center.
   #       - lambda: |-
   #           int left=16; // 16 is empty left.
@@ -880,9 +880,9 @@ text_sensor:
   #           switch.is_on: nextion_init
   #       - lambda: |- 
   #           if (id(hotwater_charge).state == "on") {
-  #             id(disp1).set_component_value("climate.a12",1);
+  #             id(disp1).set_component_value("climate.hotwater",1);
   #           } else {
-  #             id(disp1).set_component_value("climate.a12",0);
+  #             id(disp1).set_component_value("climate.hotwater",0);
   #           }
 
 #########################################
@@ -956,7 +956,7 @@ switch:
   #   assumed_state: false
   #   optimistic: true
   #   on_turn_off:
-  #     - lambda: id(disp1).set_component_value("climate.a10",0);
+  #     - lambda: id(disp1).set_component_value("climate.heating",0);
   #     - globals.set:
   #           id: hvac_mode_global
   #           value: '0'
@@ -965,11 +965,11 @@ switch:
   #         data_template:
   #           entity_id: $ha_climate_thermostat
   #           hvac_mode: 'off'
-  #     - lambda: id(disp1).send_command_printf("climate.a06.pic=49");
+  #     - lambda: id(disp1).send_command_printf("climate.heating_state.pic=49");
   #     - lambda: id(disp1).send_command_printf("home.a51.pic=53");
   #     - lambda: id(disp1).send_command_printf("climate.a51.pic=53");
   #   on_turn_on:
-  #     - lambda: id(disp1).set_component_value("climate.a10",1);
+  #     - lambda: id(disp1).set_component_value("climate.heating",1);
   #     - globals.set:
   #           id: hvac_mode_global
   #           value: '1'
@@ -981,9 +981,9 @@ switch:
   #     - lambda: |-
   #         if (id(heating_room_global) == 0) 
   #         {
-  #           id(disp1).send_command_printf("climate.a06.pic=50");
+  #           id(disp1).send_command_printf("climate.heating_state.pic=50");
   #         } else if (id(heating_room_global) == 1) {
-  #           id(disp1).send_command_printf("climate.a06.pic=51");
+  #           id(disp1).send_command_printf("climate.heating_state.pic=51");
   #         } 
   #     - lambda: id(disp1).send_command_printf("home.a51.pic=65");
   #     - lambda: id(disp1).send_command_printf("climate.a51.pic=65");
@@ -1137,22 +1137,22 @@ display:
         # - lambda: |-
         #     id(disp1).send_command_printf("home.a50.pic=53");
         #     id(disp1).send_command_printf("climate.a50.pic=53");
-        #     id(disp1).send_command_printf("climate.a06.pic=50");
+        #     id(disp1).send_command_printf("climate.heating_state.pic=50");
         #     if (id(heating_room_global) == 1) 
         #     {
         #       id(disp1).send_command_printf("home.a52.pic=66");
         #       id(disp1).send_command_printf("climate.a52.pic=66");
-        #       id(disp1).send_command_printf("climate.a06.pic=51");
+        #       id(disp1).send_command_printf("climate.heating_state.pic=51");
         #     }
         # - lambda: |-
         #     if (id(hvac_mode_global) == 0) {
         #       id(disp1).send_command_printf("home.a51.pic=53");
         #       id(disp1).send_command_printf("climate.a51.pic=53");
-        #       id(disp1).send_command_printf("climate.a06.pic=49");
+        #       id(disp1).send_command_printf("climate.heating_state.pic=49");
         #     } else if (id(hvac_mode_global) == 1) {
         #       id(disp1).send_command_printf("home.a51.pic=65");
         #       id(disp1).send_command_printf("climate.a51.pic=65");
-        #       id(disp1).set_component_value("climate.a10",1);
+        #       id(disp1).set_component_value("climate.heating",1);
         #     }
 
 #############################################################