diff --git a/esphome.yaml b/esphome.yaml
index b02e801..652a44a 100644
--- a/esphome.yaml
+++ b/esphome.yaml
@@ -234,17 +234,17 @@ api:
 
 globals:
 
-  ##### Save Target Temp #####
-  - id: climate_target_temp_val_global
-    type: float
-    restore_value: true
-    initial_value: '12'
+  # ##### Save Target Temp #####
+  # - id: climate_target_temp_val_global
+  #   type: float
+  #   restore_value: true
+  #   initial_value: '12'
 
-  ##### Save Thermostat PIC Position #####
-  - id: climate_slider_val_global
-    type: int
-    restore_value: true
-    initial_value: '0'
+  # ##### Save Thermostat PIC Position #####
+  # - id: climate_slider_val_global
+  #   type: int
+  #   restore_value: true
+  #   initial_value: '0'
 
   ##### Save Display Brightness for NSPanel reboot #####
   - id: display_brightness_global
@@ -264,37 +264,37 @@ globals:
     restore_value: true
     initial_value: '0'
 
-  ##### Save State Heating Room #####
-  - id: heating_room_global
-    type: int
-    restore_value: true
-    initial_value: '0'
+  # ##### Save State Heating Room #####
+  # - id: heating_room_global
+  #   type: int
+  #   restore_value: true
+  #   initial_value: '0'
 
   ##### Save State HVAC #####
-  - id: hvac_mode_global
-    type: int
-    restore_value: true
-    initial_value: '0'
+  # - id: hvac_mode_global
+  #   type: int
+  #   restore_value: true
+  #   initial_value: '0'
 
-  ##### lastclick State #####
+  ##### lastclick_general State #####
   - id: lastclick_general_global
     type: std::string
     restore_value: no
     initial_value: ''
 
-  ##### lastclick State #####
+  ##### lastclick_lightsettings State #####
   - id: lastclick_lightsettings_global
     type: std::string
     restore_value: no
     initial_value: ''
 
-  ##### lastclick State #####
+  ##### lastclick_coversettings State #####
   - id: lastclick_coversettings_global
     type: std::string
     restore_value: no
     initial_value: ''
 
-  ##### lastclick State #####
+  ##### lastclick_climatesettings State #####
   - id: lastclick_climatesettings_global
     type: std::string
     restore_value: no