diff --git a/mqtt.yaml b/mqtt.yaml
index 99cab2f..cbcda9d 100644
--- a/mqtt.yaml
+++ b/mqtt.yaml
@@ -36,7 +36,7 @@
     value_template: '{{ float(value) * 99 + 1 }}'
     state_class: measurement
     entity_category: diagnostic
-    state_topic: rtl_433/sdr/devices/Auriol-AHFL/1/106/battery_ok
+    state_topic: rtl_433/sdr/devices/Auriol-AHFL/1/244/battery_ok
     unique_id: Auriol-AHFL-1-106-B
     device:
       identifiers: Auriol-AHFL-1-106
@@ -45,11 +45,11 @@
       manufacturer: rtl_433
 
   - device_class: temperature
-    name: Temptertur
+    name: Temperatur
     unit_of_measurement: °C
     value_template: '{{ value|float }}'
     state_class: measurement
-    state_topic: rtl_433/sdr/devices/Auriol-AHFL/1/106/temperature_C
+    state_topic: rtl_433/sdr/devices/Auriol-AHFL/1/244/temperature_C
     unique_id: Auriol-AHFL-1-106-T
     device:
       identifiers: Auriol-AHFL-1-106
@@ -62,7 +62,7 @@
     unit_of_measurement: '%'
     value_template: '{{ value|float }}'
     state_class: measurement
-    state_topic: rtl_433/sdr/devices/Auriol-AHFL/1/106/humidity
+    state_topic: rtl_433/sdr/devices/Auriol-AHFL/1/244/humidity
     unique_id: Auriol-AHFL-1-106-H
     device:
       identifiers: Auriol-AHFL-1-106
@@ -70,74 +70,18 @@
       model: Auriol-AHFL
       manufacturer: rtl_433
 
-# Only temperature
-  - device_class: temperature
-    name: Temperatur
-    unit_of_measurement: °C
-    value_template: '{{ value|float }}'
-    state_class: measurement
-    state_topic: rtl_433/sdr/devices/AmbientWeather-TX8300/1/29/temperature_C
-    unique_id: AmbientWeather-TX8300-1-29-T
-    device:
-      identifiers: AmbientWeather-TX8300-1-29
-      name: AmbientWeather-TX8300-1-29
-      model: AmbientWeather-TX8300
-      manufacturer: rtl_433
-
-# fair T/H/Bat
   - device_class: battery
     name: Batterie
     unit_of_measurement: '%'
     value_template: '{{ float(value) * 99 + 1 }}'
     state_class: measurement
     entity_category: diagnostic
-    state_topic: rtl_433/sdr/devices/inFactory-TH/1/129/battery_ok
-    unique_id: inFactory-TH-1-129-B
+    state_topic: rtl_433/sdr/devices/Vauno-EN8822C/1/244/battery_ok
+    unique_id: Vauno-EN8822C-1-244-B
     device:
-      identifiers: inFactory-TH-1-129
-      name: inFactory-TH-1-129
-      model: inFactory-TH
-      manufacturer: rtl_433
-
-  - device_class: temperature
-    name: Temperatur
-    unit_of_measurement: °F
-    value_template: '{{ value|float }}'
-    state_class: measurement
-    state_topic: rtl_433/sdr/devices/inFactory-TH/1/129/temperature_F
-    unique_id: inFactory-TH-1-129-F
-    device:
-      identifiers: inFactory-TH-1-129
-      name: inFactory-TH-1-129
-      model: inFactory-TH
-      manufacturer: rtl_433
-
-  - device_class: humidity
-    name: Luftfeuchtigkeit
-    unit_of_measurement: '%'
-    value_template: '{{ value|float }}'
-    state_class: measurement
-    state_topic: rtl_433/sdr/devices/inFactory-TH/1/129/humidity
-    unique_id: inFactory-TH-1-129-H
-    device:
-      identifiers: inFactory-TH-1-129
-      name: inFactory-TH-1-129
-      model: inFactory-TH
-      manufacturer: rtl_433
-
-# weak, good T/H/Bat
-  - device_class: battery
-    name: Batterie
-    unit_of_measurement: '%'
-    value_template: '{{ float(value) * 99 + 1 }}'
-    state_class: measurement
-    entity_category: diagnostic
-    state_topic: rtl_433/sdr/devices/Nexus-TH/1/224/battery_ok
-    unique_id: Nexus-TH-1-224-B
-    device:
-      identifiers: Nexus-TH-1-224
-      name: Nexus-TH-1-224
-      model: Nexus-TH
+      identifiers: Vauno-EN8822C-1-244
+      name: Vauno-EN8822C-1-244
+      model: Vauno-EN8822C
       manufacturer: rtl_433
 
   - device_class: temperature
@@ -145,12 +89,12 @@
     unit_of_measurement: °C
     value_template: '{{ value|float }}'
     state_class: measurement
-    state_topic: rtl_433/sdr/devices/Nexus-TH/1/224/temperature_C
-    unique_id: Nexus-TH-1-224-T
+    state_topic: rtl_433/sdr/devices/Vauno-EN8822C/1/244/temperature_C
+    unique_id: Vauno-EN8822C-1-244-T
     device:
-      identifiers: Nexus-TH-1-224
-      name: Nexus-TH-1-224
-      model: Nexus-TH
+      identifiers: Vauno-EN8822C-1-244
+      name: Vauno-EN8822C-1-244
+      model: Vauno-EN8822C
       manufacturer: rtl_433
 
   - device_class: humidity
@@ -158,10 +102,11 @@
     unit_of_measurement: '%'
     value_template: '{{ value|float }}'
     state_class: measurement
-    state_topic: rtl_433/sdr/devices/Nexus-TH/1/224/humidity
-    unique_id: Nexus-TH-1-224-H
+    state_topic: rtl_433/sdr/devices/Vauno-EN8822C/1/244/humidity
+    unique_id: Vauno-EN8822C-1-244-H
     device:
-      identifiers: Nexus-TH-1-224
-      name: Nexus-TH-1-224
-      model: Nexus-TH
+      identifiers: Vauno-EN8822C-1-244
+      name: Vauno-EN8822C-1-244
+      model: Vauno-EN8822C
       manufacturer: rtl_433
+