diff --git a/mcu-air-office-r.yaml b/mcu-air-office-r.yaml
index 77434fc..255a322 100644
--- a/mcu-air-office-r.yaml
+++ b/mcu-air-office-r.yaml
@@ -13,8 +13,8 @@ esp32:
   # board: m5stamp-pico
   framework:
     type: esp-idf
-    version: 5.1.2
-    platform_version: 6.6.0
+    # version: 5.2.1
+    # platform_version: 6.6.0
 
 external_components:
   - source: components
@@ -58,7 +58,7 @@ light:
     rgb_order: GRB
     pin: 27
     num_leds: 1
-    rmt_channel: 0
+    # rmt_channel: 0
     chipset: ws2812
     restore_mode: ALWAYS_OFF
   - platform: esp32_rmt_led_strip
@@ -67,7 +67,7 @@ light:
     rgb_order: GRB
     pin: 25
     num_leds: 7
-    rmt_channel: 1
+    # rmt_channel: 1
     chipset: ws2812
     restore_mode: ALWAYS_OFF
     effects:
diff --git a/mcu-cam-1.yaml b/mcu-cam-1.yaml
index 5b21e35..e2c3563 100644
--- a/mcu-cam-1.yaml
+++ b/mcu-cam-1.yaml
@@ -10,10 +10,10 @@ esphome:
 esp32:
   board: esp32cam
   framework:
-    type: arduino
-    # type: esp-idf
-    version: 2.0.14
-    platform_version: 6.5.0
+    # type: arduino
+    type: esp-idf
+    # version: 2.0.14
+    # platform_version: 6.5.0
 
 packages:
   common: !include common/common.yaml
diff --git a/mcu-clock-1.yaml b/mcu-clock-1.yaml
index 683ef62..6260eab 100644
--- a/mcu-clock-1.yaml
+++ b/mcu-clock-1.yaml
@@ -14,8 +14,8 @@ esp32:
   variant: esp32c3
   framework:
     type: esp-idf
-    version: 5.1.2
-    platform_version: 6.5.0
+    # version: 5.2.1
+    # platform_version: 6.6.0
 
 packages:
   common: !include common/common.yaml
diff --git a/mcu-desk-lamp.yaml b/mcu-desk-lamp.yaml
index fec564a..3f39401 100644
--- a/mcu-desk-lamp.yaml
+++ b/mcu-desk-lamp.yaml
@@ -11,9 +11,15 @@ esp32:
   board: m5stack-atom
   framework:
     type: esp-idf
-    version: 5.1.2
-    platform_version: 6.6.0
-  
+    # version: 5.2.1
+    # platform_version: 6.6.0
+
+# external_components:
+#   - source: github://pr#7958
+#     refresh: 0s
+#     components:
+#       - rotary_encoder
+
 packages:
   common: !include common/common.yaml
 
@@ -140,4 +146,4 @@ sensor:
             // apply new settings
             call.set_brightness(brightness);
             call.set_color_temperature(temp);
-            call.perform();
+            call.perform();
\ No newline at end of file
diff --git a/mcu-dimmer.yaml b/mcu-dimmer.yaml
index 0a9d65a..518ed66 100644
--- a/mcu-dimmer.yaml
+++ b/mcu-dimmer.yaml
@@ -33,9 +33,8 @@ esp32:
     # type: arduino
     # version: 2.0.14
     type: esp-idf
-    # version: 5.1.2
-    version: 5.2.1
-    platform_version: 6.6.0
+    # version: 5.2.1
+    # platform_version: 6.6.0
 
 external_components:
   - source: github://pr#7072
@@ -57,7 +56,7 @@ light:
     rgb_order: GRB
     pin: 27
     num_leds: 1
-    rmt_channel: 0
+    # rmt_channel: 0
     chipset: ws2812
     restore_mode: ALWAYS_OFF
     effects:
diff --git a/mcu-echo-1.yaml b/mcu-echo-1.yaml
index c156cf6..3dbe3ca 100644
--- a/mcu-echo-1.yaml
+++ b/mcu-echo-1.yaml
@@ -12,8 +12,8 @@ esp32:
   board: m5stack-atom
   framework:
     type: arduino
-    version: 2.0.14
-    platform_version: 6.5.0
+    # version: 2.0.14
+    # platform_version: 6.5.0
     # type: esp-idf
     # version: 5.1.2
     # platform_version: 6.5.0
@@ -32,7 +32,7 @@ external_components:
     refresh: 0s
 
 packages:
-  common: !include common/common.yaml
+  common: !include common/common_esp8266.yaml # this profile is without fancy features that are not supported by arduino
 
 api:
   services:
@@ -45,8 +45,8 @@ api:
             rtttl: !lambda 'return song;'
 
 # i2c:
-#   sda: 32
-#   scl: 26
+  # sda: 26
+  # scl: 32
 #   scan: true #false
 #   frequency: 100kHz
 
@@ -127,7 +127,7 @@ speaker:
     i2s_dout_pin:
       number: 22
       allow_other_uses: true
-    mode: mono
+    channel: mono
 
 rtttl:
   id: my_rtttl
@@ -140,10 +140,10 @@ microphone:
     adc_type: external
     pdm: true
 
-# voice_assistant:
-#   microphone: echo_microphone
-#   on_tts_end:
-#     - media_player.play_media:
-#         id: media_out
-#         media_url: !lambda |-
-#           return x;
\ No newline at end of file
+voice_assistant:
+  microphone: echo_microphone
+  on_tts_end:
+    - media_player.play_media:
+        id: media_out
+        media_url: !lambda |-
+          return x;
\ No newline at end of file
diff --git a/mcu-echo.yaml b/mcu-echo.yaml
index 04af454..f5924af 100644
--- a/mcu-echo.yaml
+++ b/mcu-echo.yaml
@@ -26,7 +26,7 @@ external_components:
   #   refresh: 0s
 
 packages:
-  common: !include common/common.yaml
+  common: !include common/common_esp8266.yaml
 
 # api:
   # services:
@@ -39,8 +39,8 @@ packages:
   #           rtttl: !lambda 'return song;'
 
 i2c:
-  sda: 32
-  scl: 26
+  sda: 26
+  scl: 32
   scan: true #false
   frequency: 100kHz
 
@@ -133,25 +133,25 @@ media_player:
     dac_type: external
     i2s_dout_pin:
       number: 22
-      # allow_other_uses: true
+      allow_other_uses: true
     mode: mono
     on_play:
       - light.turn_on: led_light
     on_idle:
       - light.turn_off: led_light
 
-# speaker:
-#   - platform: i2s_audio
-#     id: echo_speaker
-#     dac_type: external
-#     i2s_dout_pin:
-#       number: 22
-#       allow_other_uses: true
-#     mode: mono
+speaker:
+  - platform: i2s_audio
+    id: echo_speaker
+    dac_type: external
+    i2s_dout_pin:
+      number: 22
+      allow_other_uses: true
+    channel: mono
 
-# rtttl:
-#   id: my_rtttl
-#   speaker: echo_speaker
+rtttl:
+  id: my_rtttl
+  speaker: echo_speaker
 
 # microphone:
 #   - platform: i2s_audio
diff --git a/mcu-fireplace.yaml b/mcu-fireplace.yaml
index 5e11d25..fa87f5e 100644
--- a/mcu-fireplace.yaml
+++ b/mcu-fireplace.yaml
@@ -11,8 +11,8 @@ esp32:
   board: m5stack-atom
   framework:
     type: esp-idf
-    version: 5.1.2
-    platform_version: 6.6.0
+    # version: 5.1.2
+    # platform_version: 6.6.0
 
 external_components:
   - source: github://mknjc/esphome@ds248x
diff --git a/mcu-gate.yaml b/mcu-gate.yaml
index 7ba0a4a..450f67b 100644
--- a/mcu-gate.yaml
+++ b/mcu-gate.yaml
@@ -11,8 +11,8 @@ esp32:
   board: m5stack-atom
   framework:
     type: esp-idf
-    version: 5.1.2
-    platform_version: 6.5.0
+    # version: 5.1.2
+    # platform_version: 6.5.0
 
 external_components:
   - source: components
@@ -97,6 +97,7 @@ switch:
 
 # Bluetooth related stuff
 esp32_ble_tracker:
+  id: ${name}_ble_tracker
   scan_parameters:
     duration: 1min
 
diff --git a/mcu-gateway.yaml b/mcu-gateway.yaml
index b5fc829..b2b9750 100644
--- a/mcu-gateway.yaml
+++ b/mcu-gateway.yaml
@@ -10,8 +10,8 @@ esphome:
 esp32:
   board: esp32doit-devkit-v1
   framework:
-    version: 5.1.2
-    platform_version: 6.6.0
+    # version: 5.1.2
+    # platform_version: 6.6.0
     type: esp-idf
 
 # external_components:
@@ -71,6 +71,12 @@ i2c:
   #   gateway: 10.17.240.1
   #   subnet: 255.255.255.0
 
+
+ethernet:
+  # use_address: 10.17.241.254
+  # use_address: 10.17.241.98
+  use_address: mcu-gateway.local
+
 uart:
   id: uart_modbus
   tx_pin: 4
diff --git a/mcu-heating.yaml b/mcu-heating.yaml
index e88663d..8d8f8cb 100644
--- a/mcu-heating.yaml
+++ b/mcu-heating.yaml
@@ -12,8 +12,8 @@ esp32:
   board: m5stack-atom
   framework:
     type: esp-idf
-    version: 5.1.2
-    platform_version: 6.6.0
+    # version: 5.1.2
+    # platform_version: 6.6.0
 
 external_components:
   - source: github://mknjc/esphome@ds248x
@@ -117,36 +117,6 @@ time:
     id: ha_time
     timezone: Europe/Bratislava
     on_time:
-      # - seconds: 0
-      #   minutes: 0
-      #   hours: 5
-      #   # days_of_week: MON-FRI
-      #   then:
-      #     - climate.control:
-      #         id: hot_water_climate
-      #         mode: "AUTO"
-      # - seconds: 0
-      #   minutes: 0
-      #   hours: 6
-      #   then:
-      #     - climate.control:
-      #         id: hot_water_climate
-      #         mode: "OFF"
-      # - seconds: 0
-      #   minutes: 0
-      #   hours: 16
-      #   # days_of_week: MON-FRI
-      #   then:
-      #     - climate.control:
-      #         id: hot_water_climate
-      #         mode: "AUTO"
-      # - seconds: 0
-      #   minutes: 0
-      #   hours: 0
-      #   then:
-      #     - climate.control:
-      #         id: hot_water_climate
-      #         mode: "OFF"
       - seconds: 0
         minutes: /1
         # hours: 5-23
@@ -154,72 +124,16 @@ time:
         then:
           lambda: |-
             if (id(hot_water_heater).state >= 67.0) {
-              id(relay_1).turn_off();
+              id(hot_water_demand).turn_off();
             }
-            // ## Solar
-            // move to temp sensor?
-            // //ESP_LOGD("main", "(hot_water_solar - current_hot_water_solar_delta) > set_hot_water_solar_temperature [(%.2f - %.2f) > %.2f] == TRUE", id(hot_water_solar).state, id(set_hot_water_solar_delta), id(set_hot_water_solar_temperature));
-            //if ((id(hot_water_solar).state <= id(set_hot_water_solar_temperature)) && ((id(temp_1).state + id(set_hot_water_solar_delta)) >= id(hot_water_solar).state)) {
-            //  ESP_LOGD("main", "Water in solar tank is colder AND temperature of solar collector is higher => ON");
-            //  id(relay_1).turn_on();
-            //}
-            //if ((id(hot_water_solar).state > id(set_hot_water_solar_temperature)) || ((id(temp_1).state - id(hot_water_solar).state) < (id(set_hot_water_solar_delta) / 2))) {
-            //  ESP_LOGD("main", "Water in solar tank is higher OR temperature of solar collector is lower => OFF");
-            //  id(relay_1).turn_off();
-            //}
 
-            // ## Hot Water
-            if (!true) {
-            if ((id(ha_time).now().hour >= 5) && (id(ha_time).now().hour <= 23)) {
-              if (id(hot_water_heater).state <= id(set_hot_water_heating_temperature_min)) {
-                ESP_LOGD("main", "Water in heated tank is cold, needs to reheat => ON");
-                id(relay_1).turn_on();
-                //id(relay_3).turn_on();
-                id(relay_4).turn_on();
-              } else {
-                if (id(hot_water_heater).state >= id(set_hot_water_heating_temperature_max)) {
-                  ESP_LOGD("main", "Water in heated tank is OK => OFF");
-                  id(relay_1).turn_off();
-                  //id(relay_3).turn_off();
-                  id(relay_4).turn_off();
-                }
-              }
-            } else {
-              ESP_LOGD("main", "Night Mode, Hot water heating => OFF");
-              id(relay_1).turn_off();
-            }
-            }
-            
             // ## Heating - TYPE 1: heat water to desired max temperature at specified times
             // ## Heating - TYPE 2: mantain temperature in min-max range in desired time range
-            //if ( (id(relay_2).state) && (id(heating_climate).mode == 0)) {
             if (id(heating_climate).mode == 0) {
-              id(relay_2).turn_off();
+              id(heating_demand).turn_off();
               ESP_LOGD("main", "Climate Heating is OFF => Turn Heating OFF!");
             } else {
-              ESP_LOGD("main", "Climate Heating state is other than OFFF => dont touch heating");
-            }
-            if (!true) {
-            //if (!id(heating_override).state) { // if not overriden from Thermosta
-              if (id(ha_time).now().hour >= 7 && id(ha_time).now().hour <= 23) { // is between 5:00-23:59
-                if ((id(current_heating_temperature_min).state <= id(set_heating_temperature_min)) && !id(heating_fireplace_status).state) { // temperature LOWER than set AND fireplace is NOT ON
-                  ESP_LOGD("main", "Is cold inside, heating => ON DISABLED");
-                  id(relay_2).turn_on();
-                } else {
-                  if (id(current_heating_temperature_min).state >= id(set_heating_temperature_max)) {
-                    ESP_LOGD("main", "Temperature is fine, heating => OFF");
-                    id(relay_2).turn_off();
-                  }
-                  if (id(heating_fireplace_status).state) {
-                    ESP_LOGD("main", "Fireplace is ON, heating => OFF");
-                    id(relay_2).turn_off();
-                  }
-                }
-              } else { // othervise night mode
-                ESP_LOGD("main", "Night Mode, heating => OFF");
-                id(relay_2).turn_off();
-              }
-            //}
+              ESP_LOGD("main", "Climate Heating state is other than OFF => dont touch heating");
             }
 
 climate:
@@ -235,9 +149,9 @@ climate:
     default_target_temperature_low: 48 °C
     default_target_temperature_high: 56 °C
     heat_action:
-      - switch.turn_on: relay_1
+      - switch.turn_on: hot_water_demand
     idle_action:
-      - switch.turn_off: relay_1
+      - switch.turn_off: hot_water_demand
     away_config:
       default_target_temperature_low: 30 °C
       default_target_temperature_high: 40 °C
@@ -252,22 +166,12 @@ climate:
     default_target_temperature_low: 19 °C
     default_target_temperature_high: 20 °C
     heat_action:
-      - switch.turn_on: relay_2
+      - switch.turn_on: heating_demand
     idle_action:
-      - switch.turn_off: relay_2
+      - switch.turn_off: heating_demand
     away_config:
       default_target_temperature_low: 17 °C
       default_target_temperature_high: 18 °C
-# interval:
-#   - interval: 5s
-#     then:
-#       - display.page.show_next: display_1
-#       # - display.page.show_next: display_2
-#       - component.update: display_1
-#       # - component.update: display_2
-
-# dallas:
-#   - pin: 32
 
 i2c:
   # - id: i2c0
@@ -298,113 +202,30 @@ uart:
     stop_bits: 2
     # debug:
 
-# light:
-#   - platform: neopixelbus
-#     type: GRB
-#     pin: 27
-#     variant: WS2812
-#     num_leds: 1
-#     name: "${name} Light"
-#     id: neo
-#     effects:
-#       # Use default parameters:
-#       - random:
-#       # Customize parameters
-#       - random:
-#           name: "My Slow Random Effect"
-#           transition_length: 30s
-#           update_interval: 30s
-#       - random:
-#           name: "My Fast Random Effect"
-#           transition_length: 4s
-#           update_interval: 5s
-#       - strobe:
-#       - strobe:
-#           name: Strobe Effect With Custom Values
-#           colors:
-#             - state: True
-#               brightness: 100%
-#               red: 100%
-#               green: 90%
-#               blue: 0%
-#               duration: 500ms
-#             - state: False
-#               duration: 250ms
-#             - state: True
-#               brightness: 100%
-#               red: 0%
-#               green: 100%
-#               blue: 0%
-#               duration: 500ms
-#       - flicker:
-#       - flicker:
-#           name: Flicker Effect With Custom Values
-#           alpha: 95%
-#           intensity: 1.5%
-#       - addressable_rainbow:
-#       - addressable_rainbow:
-#           name: Rainbow Effect With Custom Values
-#           speed: 10
-#           width: 50
-#       - addressable_scan:
-#       - addressable_scan:
-#           name: Scan Effect With Custom Values
-#           move_interval: 100ms
-
 pca9554:
   - id: pca9554_module
     address: 0x27
 
 switch:
-  # - platform: gpio
-  #   name: "${name} Relay 1" # Solar pump
-  #   id: relay_1
-  #   pin:
-  #     pcf8574: relay_module
-  #     number: 0
-  #     mode: OUTPUT
-  #     inverted: true
   - platform: gpio
-    name: "${name} Relay 2" # Hot Water Heating Demand (to Heater)
-    id: relay_1
+    name: "Hot Water Demand" # Hot Water Heating Demand (to Heater)
+    id: hot_water_demand
     pin: 22
     inverted: true
-    # pin:
-    #   mcp23xxx: relay_module
-    #   # pcf8574: relay_module
-    #   number: 0
-    #   mode: OUTPUT
-    #   inverted: true
-    # on_turn_on:
-    # - light.addressable_set:
-    #     id: neo
-    #     range_from: 1
-    #     range_to: 2
-    #     red: 0%
-    #     green: 100%
-    #     blue: 0%
-    # on_turn_off:
-    # - light.addressable_set:
-    #     id: neo
-    #     range_from: 1
-    #     range_to: 2
-    #     red: 100%
-    #     green: 0%
-    #     blue: 0%
   - platform: gpio
-    name: "${name} Relay 3" # Heating Demand (to Heater)
-    id: relay_2
+    name: "Heating Demand" # Heating Demand (to Heater)
+    id: heating_demand
     pin: 19
     inverted: true
   - platform: gpio
     name: "${name_1} Power Level II"
-    id: relay_3
+    id: heating_power_level_2
     pin:
       pca9554: pca9554_module
       number: 4
   - platform: gpio
     name: "${name_1} Power Level III"
-    id: relay_4
+    id: heating_power_level_3
     pin:
       pca9554: pca9554_module
       number: 5
@@ -432,14 +253,6 @@ sensor:
     address: 0x5A041750B2C8FF28 # Hot Water Tank - Bottom (Solar)
     name: "Hot Water - Solar"
     id: 'hot_water_solar'
-  # - platform: ds248x
-  #   address: 0xB2041750CF1AFF28 # Heating Water Feed (OUT from Heater, TO System)
-  #   name: "Heating OUT"
-  #   id: 'heating_out'
-  # - platform: ds248x
-  #   address: 0xDB041750EAE2FF28 # Heating Water Return (OUT from System, TO Heater)
-  #   name: "Heating IN"
-  #   id: 'heating_in'
   - platform: ds248x
     address: 0xF701143E397FAA28 # Heater Tank
     name: "Heater"
@@ -657,85 +470,6 @@ sensor:
     lambda: |-
       return id(heater_l1_energy).state + id(heater_l2_energy).state + id(heater_l3_energy).state ;
 
-# font:
-#   - file: 'slkscr.ttf'
-#     id: font_1
-#     size: 8
-#   - file: 'BebasNeue-Regular.ttf'
-#     id: font_2
-#     size: 48
-#   - file: 'arial.ttf'
-#     id: font_3
-#     size: 14
-#   - file: 'B612Mono-Regular.ttf'
-#     id: font_4
-#     size: 16
-
-# display:
-#   - platform: ssd1306_i2c
-#     model: "SSD1306 128x64"
-#     address: 0x3C # 0x78
-#     #address: 0x3D # 0x7A
-#     id: display_1
-#     pages:
-#       # - id: page_1
-#       #   lambda: |-
-#       #     it.print(0, 0, id(font_3), "TEMP 1");
-#       #     if (id(temp_1).has_state()) {
-#       #       it.printf(0, 16, id(font_2), TextAlign::TOP_LEFT, "%.1f°", id(temp_1).state);
-#       #     }
-#       # - id: page_2
-#       #   lambda: |-
-#       #     it.print(0, 0, id(font_3), "TEMP 2");
-#       #     if (id(temp_1).has_state()) {
-#       #       it.printf(0, 16, id(font_2), TextAlign::TOP_LEFT, "%.1f°", id(temp_2).state);
-#       #     }
-#       # - id: page_3
-#       #   lambda: |-
-#       #     it.print(0, 0, id(font_3), "TEMP 3");
-#       #     if (id(temp_1).has_state()) {
-#       #       it.printf(0, 16, id(font_2), TextAlign::TOP_LEFT, "%.1f°", id(temp_3).state);
-#       #     }
-#       # - id: page_4
-#       #   lambda: |-
-#       #     it.print(0, 0, id(font_3), "TEMP 4");
-#       #     if (id(temp_1).has_state()) {
-#       #       it.printf(0, 16, id(font_2), TextAlign::TOP_LEFT, "%.1f°", id(temp_4).state);
-#       #     }
-#       # - id: page_5
-#       #   lambda: |-
-#       #     it.printf(0,  0, id(font_1), TextAlign::TOP_LEFT, "RELAY 1: %s", id(relay_1).state ? "ON" : "OFF");
-#       #     it.printf(0,  8, id(font_1), TextAlign::TOP_LEFT, "RELAY 2: %s", id(relay_2).state ? "ON" : "OFF");
-#       #     it.printf(0, 16, id(font_1), TextAlign::TOP_LEFT, "RELAY 3: %s", id(relay_3).state ? "ON" : "OFF");
-#       #     it.printf(0, 24, id(font_1), TextAlign::TOP_LEFT, "RELAY 4: %s", id(relay_4).state ? "ON" : "OFF");
-#       - id: page_6
-#         lambda: |-
-#           it.print(0, 0, id(font_3), "Hot Water");
-#           it.printf(100,  0, id(font_3), TextAlign::TOP_LEFT, "%s", id(relay_2).state ? "ON" : "OFF");
-#           if (id(hot_water_heater).has_state()) {
-#             it.printf(0, 16, id(font_2), TextAlign::TOP_LEFT, "%.1f°", id(hot_water_heater).state);
-#           }
-
-#   - platform: ssd1306_i2c
-#     model: "SSD1306 128x64"
-#     #address: 0x3C # 0x78
-#     address: 0x3D # 0x7A
-#     id: display_2
-#     pages:
-#       - id: page_2_1
-#         lambda: |-
-#           it.print(0, 0, id(font_3), "Heating");
-#           it.printf(100,  0, id(font_3), TextAlign::TOP_LEFT, "%s", id(relay_3).state ? "ON" : "OFF");
-#           it.print(100, 32, id(font_1), TextAlign::BOTTOM_LEFT, "max");
-#           if (id(current_heating_temperature_max).has_state()) {
-#             it.printf(0, 32, id(font_4), TextAlign::BOTTOM_LEFT, "%.1f°", id(current_heating_temperature_max).state);
-#           }
-#           it.print(100, 48, id(font_1), TextAlign::BOTTOM_LEFT, "min");
-#           if (id(current_heating_temperature_min).has_state()) {
-#             it.printf(0, 48, id(font_4), TextAlign::BOTTOM_LEFT, "%.1f°", id(current_heating_temperature_min).state);
-#           }
-#           it.printf(0,  64, id(font_4), TextAlign::BOTTOM_LEFT, "%s", id(off_peak_status).state ? "OFF PEAK POWER" : "Disabled");
-
 binary_sensor:
   - platform: gpio
     name: "${name} Off Peak" # Off Peak (HDO)
@@ -764,15 +498,6 @@ binary_sensor:
     filters:
       - delayed_on: 300ms
       - delayed_off: 300ms
-  - platform: gpio
-    name: "${name} Input 3" # Heating Demand/Override (from Thermostat)
-    id: heating_override
-    pin:
-      pca9554: pca9554_module
-      number: 3
-    filters:
-      - delayed_on: 300ms
-      - delayed_off: 300ms
   - platform: template
     id: heating_fireplace_status
     lambda: |-
@@ -785,7 +510,7 @@ binary_sensor:
     id: heater_alarm
     name: "Heater Alarm"
     lambda: |-
-      if (id(off_peak_status).state && (id(relay_2).state || id(relay_3).state) && !id(heater_on).state) {
+      if (id(off_peak_status).state && (id(heating_demand).state || id(heating_power_level_2).state) && !id(heater_on).state) {
         return true;
       } else {
         return false;
diff --git a/mcu-kitchen.yaml b/mcu-kitchen.yaml
index 982cbd6..5365764 100644
--- a/mcu-kitchen.yaml
+++ b/mcu-kitchen.yaml
@@ -29,8 +29,8 @@ esp32:
   board: m5stack-atom
   framework:
     type: esp-idf
-    version: 5.1.2
-    platform_version: 6.6.0
+    # version: 5.1.2
+    # platform_version: 6.6.0
 
 packages:
   common: !include common/common.yaml
diff --git a/mcu-lightening.yaml b/mcu-lightening.yaml
index fab96d3..86189b2 100644
--- a/mcu-lightening.yaml
+++ b/mcu-lightening.yaml
@@ -13,8 +13,8 @@ esp32:
   # board: m5stamp-pico
   framework:
     type: esp-idf
-    version: 5.1.2
-    platform_version: 6.5.0
+    # version: 5.1.2
+    # platform_version: 6.5.0
 
 external_components:
   - source: components
diff --git a/mcu-lvgl.yaml b/mcu-lvgl.yaml
index f1e0431..269ccda 100644
--- a/mcu-lvgl.yaml
+++ b/mcu-lvgl.yaml
@@ -8,6 +8,7 @@ esphome:
   comment: ${comment}
   platformio_options:
     board_build.flash_mode: dio
+  includes: ota.h
 
 esp32:
   board: esp32-s3-devkitc-1
@@ -15,8 +16,8 @@ esp32:
   flash_size: 16MB
   framework:
     type: esp-idf
-    version: 5.1.2
-    platform_version: 6.5.0
+    # version: 5.1.2
+    # platform_version: 6.5.0
     # Required to achieve sufficient PSRAM bandwidth
     sdkconfig_options:
       CONFIG_ESP32S3_DEFAULT_CPU_FREQ_240: y
@@ -31,13 +32,6 @@ psram:
 packages:
   common: !include common/common.yaml
 
-external_components:
-  - source:
-      type: git
-      url: https://github.com/clydebarrow/esphome
-      ref: fd15094c0860df23d532881df36cfd16c7da1091 #previous commit - wont be needed in the future
-    components: [ lvgl ]
-
 # PINOUTS: ESP32 Cheap Yellow Display, 4.3", IPS, Capacitive 
 ## Display
 # R0        GND
@@ -177,8 +171,8 @@ number:
     step: 1
     optimistic: True
 
-debug:
-  update_interval: 5s
+# debug:
+#   update_interval: 5s
 
 sensor:
   - platform: uptime
@@ -194,15 +188,15 @@ sensor:
             id: counting_number
             cycle: True
         - script.execute: update_display
-  - platform: debug
-    free:
-      name: "${name} Heap Free"
-    block:
-      name: "${name} Heap Max Block"
-    loop_time:
-      name: "${name} Loop Time"
-    psram:
-      name: "${name} Free PSRAM"
+  # - platform: debug
+  #   free:
+  #     name: "${name} Heap Free"
+  #   block:
+  #     name: "${name} Heap Max Block"
+  #   loop_time:
+  #     name: "${name} Loop Time"
+  #   psram:
+  #     name: "${name} Free PSRAM"
   - platform: uptime
     # name: Uptime Sensor
     internal: True
@@ -231,9 +225,9 @@ sensor:
 script:
   - id: update_display
     then:
-      - lvgl.indicator.line.update:
-          id: power_meter_input
-          value: !lambda return id(counting_number).state;
+      # - lvgl.indicator.line.update:
+      #     id: power_meter_input
+      #     value: !lambda return id(counting_number).state;
       - lvgl.label.update:
           id: battery_kw
           text: !lambda |-
@@ -257,15 +251,15 @@ script:
             static char buf[8];
             snprintf(buf, sizeof(buf), "%.1fkW", id(counting_number).state);
             return buf;
-      - lvgl.img.update:
-          id: img_solar_power
-          src: solar_power_icon
-          img_recolor: 0xFFF000 #mixes this color with the base image
-          #img_recolor_opa: 100% #opacity defaults to 0% = must set this for recolor to take effect
-          #bg_color: 0xFFFFFF          
-      - lvgl.indicator.line.update:
-          id: power_meter_input2
-          value: !lambda return id(counting_number).state;
+      # - lvgl.img.update:
+      #     id: img_solar_power
+      #     src: solar_power_icon
+      #     img_recolor: 0xFFF000 #mixes this color with the base image
+      #     #img_recolor_opa: 100% #opacity defaults to 0% = must set this for recolor to take effect
+      #     #bg_color: 0xFFFFFF          
+      # # - lvgl.indicator.line.update:
+      # #     id: power_meter_input2
+      # #     value: !lambda return id(counting_number).state;
       - lvgl.label.update:
           id: battery_kw2
           text: !lambda |-
@@ -289,12 +283,12 @@ script:
             static char buf[8];
             snprintf(buf, sizeof(buf), "%.1fkW", id(counting_number).state);
             return buf;
-      - lvgl.img.update:
-          id: img_solar_power2
-          src: solar_power_icon
-          img_recolor: 0xFFF000 #mixes this color with the base image
-          #img_recolor_opa: 100% #opacity defaults to 0% = must set this for recolor to take effect
-          #bg_color: 0xFFFFFF   
+      # - lvgl.img.update:
+      #     id: img_solar_power2
+      #     src: solar_power_icon
+      #     img_recolor: 0xFFF000 #mixes this color with the base image
+      #     #img_recolor_opa: 100% #opacity defaults to 0% = must set this for recolor to take effect
+      #     #bg_color: 0xFFFFFF   
 
 image:
   - file: mdi:sun-wireless-outline
diff --git a/mcu-mains-power.yaml b/mcu-mains-power.yaml
index 64ff6fd..f9b2421 100644
--- a/mcu-mains-power.yaml
+++ b/mcu-mains-power.yaml
@@ -12,8 +12,8 @@ esp32:
   board: m5stack-atom
   framework:
     type: esp-idf
-    version: 5.1.2
-    platform_version: 6.6.0
+    # version: 5.1.2
+    # platform_version: 6.6.0
   
 packages:
   common: !include common/common.yaml
diff --git a/mcu-office-r.yaml b/mcu-office-r.yaml
index b2836a4..17e5b10 100644
--- a/mcu-office-r.yaml
+++ b/mcu-office-r.yaml
@@ -14,11 +14,9 @@ esp32:
   board: esp32-c3-devkitm-1
   variant: esp32c3
   framework:
-    # type: arduino
-    # version: 2.0.14
     type: esp-idf
-    version: 5.1.2
-    platform_version: 6.5.0
+    # version: 5.1.2
+    # platform_version: 6.5.0
 
 packages:
   common: !include common/common.yaml
diff --git a/mcu-patio.yaml b/mcu-patio.yaml
index 0d0cba5..ea8989f 100644
--- a/mcu-patio.yaml
+++ b/mcu-patio.yaml
@@ -29,8 +29,8 @@ esp32:
   board: m5stack-atom
   framework:
     type: esp-idf
-    version: 5.1.2
-    platform_version: 6.5.0
+    # version: 5.1.2
+    # platform_version: 6.5.0
 
 packages:
   common: !include common/common.yaml
diff --git a/mcu-shed.yaml b/mcu-shed.yaml
index 09b0e5d..3691a77 100644
--- a/mcu-shed.yaml
+++ b/mcu-shed.yaml
@@ -11,8 +11,8 @@ esp32:
   board: m5stack-atom
   framework:
     type: esp-idf
-    version: 5.1.2
-    platform_version: 6.6.0
+    # version: 5.1.2
+    # platform_version: 6.6.0
 
 packages:
   common: !include common/common.yaml
diff --git a/mcu-vehicle-toyota-auris-ts.yaml b/mcu-vehicle-toyota-auris-ts.yaml
index 24fd544..7a128f6 100644
--- a/mcu-vehicle-toyota-auris-ts.yaml
+++ b/mcu-vehicle-toyota-auris-ts.yaml
@@ -34,8 +34,8 @@ esp32:
   board: m5stack-atom
   framework:
     type: esp-idf
-    version: 5.1.2
-    platform_version: 6.5.0
+    # version: 5.1.2
+    # platform_version: 6.5.0
 
 external_components:
   - source: components
@@ -43,12 +43,12 @@ external_components:
 packages:
   wifi: !include common/wifi.yaml
   logger: !include common/logger.yaml
-  api: !include common/api.yaml
+  # api: !include common/api.yaml
   ota: !include common/ota.yaml
 #   common: !include common/common.yaml
 
-api:
-  reboot_timeout: 0s
+# api:
+#   reboot_timeout: 0s
 
 wifi:
   reboot_timeout: 0s
diff --git a/mcu-vehicle-toyota-yaris-cross.yaml b/mcu-vehicle-toyota-yaris-cross.yaml
index e583120..2fc5056 100644
--- a/mcu-vehicle-toyota-yaris-cross.yaml
+++ b/mcu-vehicle-toyota-yaris-cross.yaml
@@ -46,6 +46,7 @@ external_components:
 
 packages:
   common: !include common/logger.yaml
+  wifi: !include common/wifi.yaml
   # common: !include common/common.yaml
   
 # debug:
diff --git a/mcu-well.yaml b/mcu-well.yaml
index 238c763..f0550c5 100644
--- a/mcu-well.yaml
+++ b/mcu-well.yaml
@@ -24,8 +24,8 @@ esp32:
   board: m5stack-atom
   framework:
     type: esp-idf
-    version: 5.1.2
-    platform_version: 6.6.0
+    # version: 5.1.2
+    # platform_version: 6.6.0
 
 packages:
   common: !include common/common.yaml