diff --git a/esphome.yaml b/esphome.yaml
index 6b3a01e..ad8632d 100644
--- a/esphome.yaml
+++ b/esphome.yaml
@@ -13,14 +13,14 @@ substitutions:
 
 ###### EDIT THE BELOW ENTITIES FOR YOURS... #######################################################################
 
-  ha_weekday: sensor.wochentag ##### Sensor Wochentag generiert in HA (custom_configuration -> nspanel) #####
-  ha_outdoor_temp: sensor.terrasse_garage_motion_sensor_temperature ##### Temperatur von Bewegungsmelder Outdoor (Zigbee2Mqtt) #####
-  ha_hotwater_temp: sensor.hotwater_temp ##### Buderus Heizung Warmwasser Temperatur (Integration) #####
+  #ha_weekday: sensor.wochentag ##### Sensor Wochentag generiert in HA (custom_configuration -> nspanel) #####
+  #ha_outdoor_temp: sensor.terrasse_garage_motion_sensor_temperature ##### Temperatur von Bewegungsmelder Outdoor (Zigbee2Mqtt) #####
+  #ha_hotwater_temp: sensor.hotwater_temp ##### Buderus Heizung Warmwasser Temperatur (Integration) #####
   ha_hotwater_charge: switch.charge
   ha_heating_system_flame: binary_sensor.flamestatus ##### Buderus Heizung Flamen-Status (Integration) #####
   ha_climate_thermostat_target_temp: sensor.nspanel_buro_target_temp  ##### Climate Thermostat generiert in HA (custom_configuration -> nspanel) #####
   ha_climate_thermostat: climate.nspanel_buro ##### Climate Thermostat generiert in HA (custom_configuration -> nspanel) #####
-  ha_humidity: sensor.kinderzimmer_lea_temperatur_sensor_humidity
+  #ha_humidity: sensor.kinderzimmer_lea_temperatur_sensor_humidity
 #########################################
 #
 #
@@ -97,21 +97,21 @@ uart:
   id: tf_uart
 
 ##### INFO - Time component that fetches time from home Assistant and updates the display once a minute and when the display is ready at bootup (and time is available) #####
-time:
-  - platform: homeassistant
-    id: homeassistant_time
-    on_time:
-      - seconds: 0
-        minutes: /1
-        then:
-          - wait_until:
-              switch.is_on: nextion_init
-          - lambda: id(disp1).set_component_text_printf("home.a01", "%02i:%02i", id(homeassistant_time).now().hour, id(homeassistant_time).now().minute);
-    on_time_sync:
-        then:
-          - wait_until:
-              switch.is_on: nextion_init
-          - lambda: id(disp1).set_component_text_printf("home.a01", "%02i:%02i", id(homeassistant_time).now().hour, id(homeassistant_time).now().minute);
+#time:
+#  - platform: homeassistant
+#    id: homeassistant_time
+#    on_time:
+#      - seconds: 0
+#        minutes: /1
+#        then:
+#          - wait_until:
+#              switch.is_on: nextion_init
+#          - lambda: id(disp1).set_component_text_printf("home.a01", "%02i:%02i", id(homeassistant_time).now().hour, id(homeassistant_time).now().minute);
+#    on_time_sync:
+#        then:
+#          - wait_until:
+#              switch.is_on: nextion_init
+#          - lambda: id(disp1).set_component_text_printf("home.a01", "%02i:%02i", id(homeassistant_time).now().hour, id(homeassistant_time).now().minute);
 
 ###### A reboot button is always useful #####
 button:
@@ -448,37 +448,37 @@ sensor:
         - lambda: id(disp1).set_component_text_printf("thermostat.a04", "%.1f", id(temp_nspanel).state);
  
 ##### TEMPERATURE Outdoor FROM HA #####
-  - platform: homeassistant
-    id: temp_outdoor
-    entity_id: $ha_outdoor_temp
-    on_value:
-      then:
-        - wait_until:
-            switch.is_on: nextion_init
-        - lambda: id(disp1).set_component_text_printf("home.a06", "%.0f°", id(temp_outdoor).state);
-        - lambda: id(disp1).set_component_text_printf("thermostat.a07", "%.0f°", id(temp_outdoor).state);
+#  - platform: homeassistant
+#    id: temp_outdoor
+#    entity_id: $ha_outdoor_temp
+#    on_value:
+#      then:
+#        - wait_until:
+#            switch.is_on: nextion_init
+#        - lambda: id(disp1).set_component_text_printf("home.a06", "%.0f°", id(temp_outdoor).state);
+#        - lambda: id(disp1).set_component_text_printf("thermostat.a07", "%.0f°", id(temp_outdoor).state);
 
 ##### HUMIDITY Indoor FROM HA #####
-  - platform: homeassistant
-    id: humidity
-    entity_id: $ha_humidity
-    on_value:
-      then:
-        - wait_until:
-            switch.is_on: nextion_init
-        - lambda: id(disp1).set_component_text_printf("home.a04", "%.0f°", id(humidity).state);
+#  - platform: homeassistant
+#    id: humidity
+#    entity_id: $ha_humidity
+#    on_value:
+#      then:
+#        - wait_until:
+#            switch.is_on: nextion_init
+#        - lambda: id(disp1).set_component_text_printf("home.a04", "%.0f°", id(humidity).state);
 
 
 ##### THERMOSTAT HOT WATER TEMP FROM HA #####
-  - platform: homeassistant
-    id: temp_hotwater
-    entity_id: $ha_hotwater_temp
-    on_value:
-      then:
-        - wait_until:
-            switch.is_on: nextion_init
-        - lambda: id(disp1).set_component_text_printf("home.a07", "%.1f°", id(temp_hotwater).state);
-        - lambda: id(disp1).set_component_text_printf("thermostat.a08", "%.1f°", id(temp_hotwater).state);
+#  - platform: homeassistant
+#    id: temp_hotwater
+#    entity_id: $ha_hotwater_temp
+#    on_value:
+#      then:
+#        - wait_until:
+#            switch.is_on: nextion_init
+#        - lambda: id(disp1).set_component_text_printf("home.a07", "%.1f°", id(temp_hotwater).state);
+#        - lambda: id(disp1).set_component_text_printf("thermostat.a08", "%.1f°", id(temp_hotwater).state);
 
 ##### THERMOSTAT CLIMATE TARGET TEMPERATURE FROM HA #####
   - platform: homeassistant
@@ -787,14 +787,14 @@ text_sensor:
     component_name: coverposition
 
 ##### Wochentag SENSOR FROM HA ##### 
-  - platform: homeassistant
-    id: weekday
-    entity_id: $ha_weekday
-    on_value:
-      then:
-        - wait_until:
-            switch.is_on: nextion_init
-        - lambda: id(disp1).set_component_text_printf("home.a02", "%s", id(weekday).state.c_str());
+#  - platform: homeassistant
+#    id: weekday
+#    entity_id: $ha_weekday
+#    on_value:
+#      then:
+#        - wait_until:
+#            switch.is_on: nextion_init
+#        - lambda: id(disp1).set_component_text_printf("home.a02", "%s", id(weekday).state.c_str());
 
 ##### HEATING System ICON #####
   - platform: homeassistant
@@ -1165,4 +1165,4 @@ display:
 
 #############################################################
 ##### CLOSE - DISPLAY START #####
-#############################################################
\ No newline at end of file
+#############################################################