diff --git a/configuration.yaml b/configuration.yaml
index 20f26ab..85885de 100644
--- a/configuration.yaml
+++ b/configuration.yaml
@@ -121,12 +121,12 @@
     token: !secret xiaomi_humidifier2_token
     model: zhimi.humidifier.cb1
 scrape:
-  - resource: https://www.aarhusvand.dk/privat/priser/
+  - resource: https://www.aarhusvand.dk/forbrug-og-byggeri/priser/
     scan_interval: 604800
     sensor:
       name: Water Price
-      select: "table tfoot td[align] strong"
-      index: 0
+      select: "table.w-full td.pt-32"
+      index: 4
       unit_of_measurement: "DKK/m³"
       device_class: monetary
       state_class: measurement
diff --git a/esphome/kokkenbt.yaml b/esphome/kokkenbt.yaml
index 0d1d6c1..7a82aa5 100644
--- a/esphome/kokkenbt.yaml
+++ b/esphome/kokkenbt.yaml
@@ -4,7 +4,7 @@
 esp32:
   board: esp32dev
   framework:
-    type: arduino
+    type: esp-idf   
 
 # Enable logging
 logger:
@@ -22,6 +22,19 @@
   password: !secret wifi_password
 
 esp32_ble_tracker:
+  scan_parameters:
+    interval: 1100ms
+    window: 1100ms
+    active: true
 
 bluetooth_proxy:
   active: true
+
+sensor:
+  - platform: uptime
+    name: "KokkenBT Uptime"
+    update_interval: 60s
+    
+  - platform: wifi_signal
+    name: "KokkenBT WiFi Signal"
+    update_interval: 60s
\ No newline at end of file
diff --git a/esphome/nilan300.yaml b/esphome/nilan300.yaml
index 7d4bac5..356489e 100644
--- a/esphome/nilan300.yaml
+++ b/esphome/nilan300.yaml
@@ -4,7 +4,7 @@
 esp32:
   board: nodemcu-32s
   framework:
-    type: arduino
+    type: esp-idf
 
 # Enable logging
 logger:
@@ -86,6 +86,14 @@
     bitmask: 1
 
 sensor:
+  - platform: uptime
+    name: "Nilan 300 Uptime"
+    update_interval: 60s    
+    
+  - platform: wifi_signal
+    name: "Nilan 300 WiFi Signal"
+    update_interval: 60s    
+
   - platform: modbus_controller
     modbus_controller_id: nilan_modbus_controller
     name: "Bus version"
diff --git a/esphome/smartcard.yaml b/esphome/smartcard.yaml
index 90ece7a..6392713 100644
--- a/esphome/smartcard.yaml
+++ b/esphome/smartcard.yaml
@@ -1,6 +1,7 @@
 esphome:
   name: smartcard
-  platform: ESP8266
+
+esp8266:
   board: d1_mini
 
 # Enable logging
@@ -33,4 +34,13 @@
   on_tag_removed:
     then:
       - homeassistant.event:
-          event: esphome.tag_removed
\ No newline at end of file
+          event: esphome.tag_removed
+
+sensor:
+  - platform: uptime
+    name: "Smartcard Uptime"
+    update_interval: 60s
+    
+  - platform: wifi_signal
+    name: "Smartcard WiFi Signal"
+    update_interval: 60s
\ No newline at end of file
diff --git a/esphome/sovebt.yaml b/esphome/sovebt.yaml
index 3f931c2..9952021 100644
--- a/esphome/sovebt.yaml
+++ b/esphome/sovebt.yaml
@@ -4,7 +4,7 @@
 esp32:
   board: esp32dev
   framework:
-    type: arduino
+    type: esp-idf
 
 # Enable logging
 logger:
@@ -24,14 +24,22 @@
   password: !secret wifi_password
 
 esp32_ble_tracker:
-
+  scan_parameters:
+    interval: 1100ms
+    window: 1100ms
+    active: true
+    
 bluetooth_proxy:
   active: true
 
 sensor:
   - platform: uptime
-    name: Uptime
+    name: "SoveBT Uptime"
 
+  - platform: wifi_signal
+    name: "SoveBT WiFi Signal"
+    update_interval: 60s
+    
   - platform: xiaomi_miscale
     mac_address: '5C:CA:D3:8F:B1:B6'
     weight:
diff --git a/esphome/waterproxy.yaml b/esphome/waterproxy.yaml
index d172ea5..edbb338 100644
--- a/esphome/waterproxy.yaml
+++ b/esphome/waterproxy.yaml
@@ -20,13 +20,21 @@
   password: !secret wifi_password
 
 sensor:
-- platform: pulse_meter
-  pin: GPIO12
-  name: "Water Pulse Meter"
-  unit_of_measurement: "l/min"
-  icon: "mdi:water"
-  total:
-    name: "Water Total"
-    unit_of_measurement: "L"
-    device_class: water
-    state_class: total_increasing
+  - platform: pulse_meter
+    pin: GPIO12
+    name: "Water Pulse Meter"
+    unit_of_measurement: "l/min"
+    icon: "mdi:water"
+    total:
+      name: "Water Total"
+      unit_of_measurement: "L"
+      device_class: water
+      state_class: total_increasing
+
+  - platform: uptime
+    name: "WaterProxy Uptime"
+    update_interval: 60s    
+    
+  - platform: wifi_signal
+    name: "WaterProxy WiFi Signal"
+    update_interval: 60s    
\ No newline at end of file
diff --git a/esphome/wavin9000.yaml b/esphome/wavin9000.yaml
index 5abfd91..eb8f0ba 100644
--- a/esphome/wavin9000.yaml
+++ b/esphome/wavin9000.yaml
@@ -4,7 +4,7 @@
 esp32:
   board: nodemcu-32s
   framework:
-    type: arduino
+    type: esp-idf
 
 # Enable logging
 logger:
@@ -60,6 +60,24 @@
   modbus_id: ${device}_modbus
   update_interval: 30s
   
+esp32_ble_tracker:
+  scan_parameters:
+    interval: 1100ms
+    window: 1100ms
+    active: true
+    
+bluetooth_proxy:
+  active: true
+
+sensor:
+  - platform: uptime
+    name: "Wavin9000 Uptime"
+    update_interval: 60s
+    
+  - platform: wifi_signal
+    name: "Wavin9000 WiFi Signal"
+    update_interval: 60s
+
 substitutions:
   # UNIQUE NAME FOR THE DEVICE
   device: wavin9000 # Case sensitive!!!
diff --git a/sensors/openwrt.yaml b/sensors/openwrt.yaml
index fa731cf..43164c3 100644
--- a/sensors/openwrt.yaml
+++ b/sensors/openwrt.yaml
@@ -21,7 +21,7 @@
 - platform: snmp
   name: "LAN RX Octets"
   host: 10.0.1.1
-  baseoid: 1.3.6.1.2.1.31.1.1.1.10.18
+  baseoid: .1.3.6.1.2.1.31.1.1.1.10.9
   version: 2c
   community: public
   unit_of_measurement: "Octets"
@@ -30,7 +30,7 @@
 - platform: snmp
   name: "Internet TX Octets"
   host: 10.0.1.1
-  baseoid: 1.3.6.1.2.1.31.1.1.1.10.19
+  baseoid: .1.3.6.1.2.1.31.1.1.1.10.10
   version: 2c
   community: public
   unit_of_measurement: "Octets"