diff --git a/sensors/igrill.yaml b/sensors/igrill.yaml
index f8c603c..55e8cd2 100644
--- a/sensors/igrill.yaml
+++ b/sensors/igrill.yaml
@@ -1,13 +1,13 @@
 - platform: template
   sensors:
-      target_alert_temp_probe_1:
-        value_template:
-          '{% if (states.sensor.igrill_temperature.state | int(default=0)) >= (states.input_number.grill_probe_1_target.state | int) %}
-            Alert
-          {% elif (states.sensor.igrill_temperature.state | int(default=0)) >= (states.input_number.grill_probe_1_target.state | int) - 4 %}
-            Ready
-          {% else %}
-            Cooking
-          {% endif %}'
-        friendly_name: iGrill Target Alert
-     
\ No newline at end of file
+    target_alert_temp_probe_1:
+      availability_template: "{{(states.sensor.igrill_temperature.state | int(0)) > 0}}"
+      value_template:
+        "{% if (states.sensor.igrill_temperature.state | int(0)) >= (states.input_number.grill_probe_1_target.state | int) %}
+        Alert
+        {% elif (states.sensor.igrill_temperature.state | int(0)) >= (states.input_number.grill_probe_1_target.state | int) - 4 %}
+        Ready
+        {% else %}
+        Cooking
+        {% endif %}"
+      friendly_name: iGrill Target Alert
diff --git a/template/aircondition.yaml b/template/aircondition.yaml
index a252d22..d9acd40 100644
--- a/template/aircondition.yaml
+++ b/template/aircondition.yaml
@@ -18,7 +18,7 @@
       state_class: measurement
 
     - name: AirCondition Power Factor
-      availability: "{{ states.sensor.aircondition_spaending.state | float(0) > 0 }}"
+      availability: "{{ states.sensor.aircondition_strom.state | float(0) > 0 }}"
       state: |
         {# Calculate power factor #}
         {% set v = states.sensor.aircondition_spaending.state | float %}
diff --git a/template/computer-plug.yaml b/template/computer-plug.yaml
index fd48940..a9883d7 100644
--- a/template/computer-plug.yaml
+++ b/template/computer-plug.yaml
@@ -18,7 +18,7 @@
       state_class: measurement
 
     - name: Computer Power Factor
-      availability: "{{ states.sensor.computer_spaending.state | float(0) > 0 }}"
+      availability: "{{ states.sensor.computer_strom.state | float(0) > 0 }}"
       state: |
         {# Calculate power factor #}
         {% set v = states.sensor.computer_spaending.state | float %}
diff --git a/template/mikroovn.yaml b/template/mikroovn.yaml
index 94aad95..064d80f 100644
--- a/template/mikroovn.yaml
+++ b/template/mikroovn.yaml
@@ -1,6 +1,6 @@
 - sensor:
     - name: Mikroovn Power Factor
-      availability: "{{ states.sensor.mikroovn_voltage.state | float(0) > 0 }}"
+      availability: "{{ states.sensor.mikroovn_current.state | float(0) > 0 }}"
       state: |
         {# Calculate power factor #}
         {% set v = states.sensor.mikroovn_voltage.state | float %}
diff --git a/template/opvaskemaskine.yaml b/template/opvaskemaskine.yaml
index 1d4a883..44f732a 100644
--- a/template/opvaskemaskine.yaml
+++ b/template/opvaskemaskine.yaml
@@ -18,7 +18,7 @@
       state_class: measurement
 
     - name: Opvaskemaskine Power Factor
-      availability: "{{ states.sensor.opvaskemaskine_spaending.state | float(0) > 0 }}"
+      availability: "{{ states.sensor.opvaskemaskine_strom.state | float(0) > 0 }}"
       state: |
         {# Calculate power factor #}
         {% set v = states.sensor.opvaskemaskine_spaending.state | float %}
diff --git a/template/teknikskab.yaml b/template/teknikskab.yaml
index 902d853..c668e02 100644
--- a/template/teknikskab.yaml
+++ b/template/teknikskab.yaml
@@ -18,7 +18,7 @@
       state_class: measurement
 
     - name: Teknikskab Power Factor
-      availability: "{{ states.sensor.teknikskab_spaending.state | default(0) | float(0) > 0 }}"
+      availability: "{{ states.sensor.teknikskab_strom.state | default(0) | float(0) > 0 }}"
       state: |
         {# Calculate power factor #}
         {% set v = states.sensor.teknikskab_spaending.state | float %}
diff --git a/template/tv_baenk.yaml b/template/tv_baenk.yaml
index 6ea0693..d81c379 100644
--- a/template/tv_baenk.yaml
+++ b/template/tv_baenk.yaml
@@ -18,7 +18,7 @@
       state_class: measurement
 
     - name: TV Bænk Power Factor
-      availability: "{{ states.sensor.tv_baenk_spaending.state | default(0) | float(0) > 0 }}"
+      availability: "{{ states.sensor.tv_baenk_strom.state | default(0) | float(0) > 0 }}"
       state: |
         {# Calculate power factor #}
         {% set v = states.sensor.tv_baenk_spaending.state | float %}