diff --git a/Integrations/ESPHome/Battery.yaml b/Integrations/ESPHome/Battery.yaml
index 186b99c..1a210af 100644
--- a/Integrations/ESPHome/Battery.yaml
+++ b/Integrations/ESPHome/Battery.yaml
@@ -27,7 +27,7 @@ switch:
     name: "Accessory Power"
     id: accessory_power
     restore_mode: ALWAYS_ON
-    setup_priority: 1100
+    setup_priority: 5000
     entity_category: CONFIG
 number:
   
diff --git a/Integrations/ESPHome/Core.yaml b/Integrations/ESPHome/Core.yaml
index 0c105e8..0105b8a 100644
--- a/Integrations/ESPHome/Core.yaml
+++ b/Integrations/ESPHome/Core.yaml
@@ -1,5 +1,5 @@
 substitutions:
-  version: "24.12.21.1"
+  version: "25.2.19.1"
 
 esp32:
   board: esp32-c3-devkitm-1
@@ -234,6 +234,7 @@ sensor:
       filters:
         - lambda: return x - id(aht_humidity_offset).state;
     update_interval: 60s
+    setup_priority: -100 # LATE
 
   - platform: adc
     pin: GPIO4
@@ -282,7 +283,6 @@ light:
     id: rgb_light
     name: "RGB Light"
     pin: GPIO3
-    rmt_channel: 0
     default_transition_length: 0s
     chipset: WS2812
     num_leds: 1