diff --git a/configuration.yaml b/configuration.yaml
index 0620b21..8a724f3 100644
--- a/configuration.yaml
+++ b/configuration.yaml
@@ -118,27 +118,6 @@
   max_retries: 3
   default_measurement: state
         
-mqtt:
-    sensor:
-    - state_topic: "bbq/grill/grill/probe1"
-      name: "iGrill_Temperature"
-      qos: 0
-      unit_of_measurement: "°C"
-    
-    - state_topic: "bbq/grill/grill/battery"
-      name: "iGrill_Battery"
-      qos: 0
-      unit_of_measurement: '%'
-      device_class: battery
-      
-    - state_topic: "stecamonitor/solcelle"
-      name: "Solcelle produktion"
-      unique_id: solar_production
-      unit_of_measurement: "W"
-      value_template: "{{ value_json.watt }}"
-      device_class: power
-      state_class: measurement
-       
 fuelprices_dk:
   fueltypes:
     - oktan 95
diff --git a/sensors/igrill.yaml b/sensors/igrill.yaml
index e6758e3..312a5d4 100644
--- a/sensors/igrill.yaml
+++ b/sensors/igrill.yaml
@@ -9,4 +9,17 @@
           {% else %}
             Cooking
           {% endif %}'
-        friendly_name: iGrill Target Alert
\ No newline at end of file
+        friendly_name: iGrill Target Alert
+        
+- platform: mqtt
+  state_topic: "bbq/grill/grill/probe1"
+  name: "iGrill_Temperature"
+  qos: 0
+  unit_of_measurement: "°C"
+
+- platform: mqtt
+  state_topic: "bbq/grill/grill/battery"
+  name: "iGrill_Battery"
+  qos: 0
+  unit_of_measurement: '%'
+  device_class: battery        
\ No newline at end of file
diff --git a/sensors/solcelle.yaml b/sensors/solcelle.yaml
new file mode 100644
index 0000000..f6ffe39
--- /dev/null
+++ b/sensors/solcelle.yaml
@@ -0,0 +1,8 @@
+- platform: mqtt
+  state_topic: "stecamonitor/solcelle"
+  name: "Solcelle produktion"
+  unique_id: solar_production
+  unit_of_measurement: "W"
+  value_template: "{{ value_json.watt }}"
+  device_class: power
+  state_class: measurement
\ No newline at end of file
diff --git a/template/tv_baenk.yaml b/template/tv_baenk.yaml
index 782c1a3..e7e9b78 100644
--- a/template/tv_baenk.yaml
+++ b/template/tv_baenk.yaml
@@ -1,4 +1,4 @@
--sensor:
+- sensor:
     - name: TV Bænk Spænding
       state: '{{ states.switch.tv_baenk.attributes.voltage }}'
       unit_of_measurement: "V"