diff --git a/configuration.yaml b/configuration.yaml
index 97de051..1f22970 100644
--- a/configuration.yaml
+++ b/configuration.yaml
@@ -103,6 +103,14 @@
     name: Wether lights have been turned off
 
 utility_meter:
+  util_solar_generated_usage_daily:
+    source: sensor.energy_generated
+    cycle: daily
+    
+  util_solar_generated_usage_monthly:
+    source: sensor.energy_generated
+    cycle: monthly
+    
   util_water_usage_hourly:
     source: sensor.water_total
     cycle: hourly
diff --git a/lights.yaml b/lights.yaml
index e10261e..381e0d2 100644
--- a/lights.yaml
+++ b/lights.yaml
@@ -51,4 +51,19 @@
     - light.gaestevaerelse
     - light.niels_seng
     - light.niels_loft
-    - light.seng
\ No newline at end of file
+    - light.seng
+- platform: group
+  name: Niels Gruppe
+  entities:
+    - light.niels_loft
+    - light.niels_seng
+    
+- platform: group
+  name: Jens Gruppe
+  entities:
+    - light.gaestevaerelse
+    
+- platform: group
+  name: Bryggers Gruppe
+  entities:
+    - light.bryggers_indhak
\ No newline at end of file
diff --git a/sensors/energy.yaml b/sensors/energy.yaml
index 8e8c44d..d84d83c 100644
--- a/sensors/energy.yaml
+++ b/sensors/energy.yaml
@@ -19,6 +19,13 @@
   unit_time: h
   round: 4
   
+- platform: integration
+  source: sensor.opvaskemaskine_energi
+  name: opvaskemaskine_power_used
+  unit_prefix: k
+  unit_time: h
+  round: 4
+  
 - platform: statistics
   name: Average energy price last 30d mean
   entity_id: sensor.energi_data_service
diff --git a/sensors/solcelle.yaml b/sensors/solcelle.yaml
index f6ffe39..de62637 100644
--- a/sensors/solcelle.yaml
+++ b/sensors/solcelle.yaml
@@ -5,4 +5,4 @@
   unit_of_measurement: "W"
   value_template: "{{ value_json.watt }}"
   device_class: power
-  state_class: measurement
\ No newline at end of file
+  state_class: measurement
diff --git a/template/aircondition.yaml b/template/aircondition.yaml
index d04a411..eb70f0b 100644
--- a/template/aircondition.yaml
+++ b/template/aircondition.yaml
@@ -1,15 +1,15 @@
 - sensor:
     - name: AirCondition Energi
-      state: '{{ states.switch.aircondition_switch.attributes.current_consumption }}'
+      state: '{{ (states.switch.aircondition_switch.attributes.current_consumption) | default(0) | float }}'
       unit_of_measurement: "W"
       device_class: power
 
     - name: AirCondition Spænding
-      state: '{{ states.switch.aircondition_switch.attributes.voltage }}'
+      state: '{{ (states.switch.aircondition_switch.attributes.voltage) | default(0) | float }}'
       unit_of_measurement: "V"
       device_class: voltage
 
     - name: AirCondition Strøm
-      state: '{{ (states.switch.aircondition_switch.attributes.current) | float * 0.001  }}'
+      state: '{{ (states.switch.aircondition_switch.attributes.current) | default(0) | float * 0.001  }}'
       unit_of_measurement: "A"
       device_class: current
\ No newline at end of file
diff --git a/template/opvaskemaskine.yaml b/template/opvaskemaskine.yaml
new file mode 100644
index 0000000..1b9b11e
--- /dev/null
+++ b/template/opvaskemaskine.yaml
@@ -0,0 +1,15 @@
+- sensor:
+    - name: Opvaskemaskine Spænding
+      state: '{{ (states.switch.opvaskemaskine_switch.attributes.voltage) | default(0)| float }}'
+      unit_of_measurement: "V"
+      device_class: voltage
+    
+    - name: Opvaskemaskine Strøm
+      state: '{{ (states.switch.opvaskemaskine_switch.attributes.current) | default(0)| float * 0.001 }}'
+      unit_of_measurement: "A"
+      device_class: current
+    
+    - name: Opvaskemaskine Energi
+      state: '{{ (states.switch.opvaskemaskine_switch.attributes.current_consumption) | default(0)| float }}'
+      unit_of_measurement: "W"
+      device_class: power
diff --git a/template/tv_baenk.yaml b/template/tv_baenk.yaml
index e7e9b78..1324dce 100644
--- a/template/tv_baenk.yaml
+++ b/template/tv_baenk.yaml
@@ -1,15 +1,15 @@
 - sensor:
     - name: TV Bænk Spænding
-      state: '{{ states.switch.tv_baenk.attributes.voltage }}'
+      state: '{{ (states.switch.tv_baenk.attributes.voltage) | default(0) | float }}'
       unit_of_measurement: "V"
       device_class: voltage
     
     - name: TV Bænk Strøm
-      state: '{{ (states.switch.tv_baenk.attributes.current) | float * 0.001 }}'
+      state: '{{ (states.switch.tv_baenk.attributes.current) | default(0) | float * 0.001 }}'
       unit_of_measurement: "A"
       device_class: current
     
     - name: TV Bænk Energi
-      state: '{{ states.switch.tv_baenk.attributes.current_consumption }}'
+      state: '{{ (states.switch.tv_baenk.attributes.current_consumption) | default(0) | float }}'
       unit_of_measurement: "W"
       device_class: power