diff --git a/template/skraldespande.yaml b/template/skraldespande.yaml
new file mode 100644
index 0000000..2df1acc
--- /dev/null
+++ b/template/skraldespande.yaml
@@ -0,0 +1,17 @@
+- sensor:
+    - name: "Dage til restaffald afhentes"
+      state: "{{ (as_local(as_datetime(state_attr('calendar.restaffald', 'start_time'))) - today_at('00:00')).days }}"
+      unit_of_measurement: "D"
+      icon: mdi:trash-can
+      attributes:
+        days: "{{ (as_local(as_datetime(state_attr('calendar.restaffald', 'start_time'))) - today_at('00:00')).days }}"
+        next_date: "{{ as_local(as_datetime(state_attr('calendar.restaffald', 'start_time'))).isoformat() }}"
+
+- sensor:
+    - name: "Dage til genbrug afhentes"
+      state: "{{ (as_local(as_datetime(state_attr('calendar.genbrug', 'start_time'))) - today_at('00:00')).days }}"
+      unit_of_measurement: "D"
+      icon: mdi:recycle
+      attributes:
+        days: "{{ (as_local(as_datetime(state_attr('calendar.genbrug', 'start_time'))) - today_at('00:00')).days }}"
+        next_date: "{{ as_local(as_datetime(state_attr('calendar.genbrug', 'start_time'))).isoformat() }}"
diff --git a/zigbee2mqtt/configuration.yaml b/zigbee2mqtt/configuration.yaml
index 57b9482..d2c2785 100644
--- a/zigbee2mqtt/configuration.yaml
+++ b/zigbee2mqtt/configuration.yaml
@@ -37,16 +37,16 @@
     friendly_name: Elmåler
   '0x84b4dbfffec3d1df':
     friendly_name: Kontor_Plug
-  '0x00124b0029209f8c':
-    friendly_name: Temp1
-  '0x00124b0029117198':
-    friendly_name: Bryggers Vindue
   '0x00124b002920814b':
     friendly_name: Temp4
   '0x00124b00292067e9':
     friendly_name: Temp3
   '0x00124b0029203033':
     friendly_name: Temp2
+  '0x00124b0029209f8c':
+    friendly_name: Temp1
+  '0x00124b0029117198':
+    friendly_name: Bryggers Vindue
 availability:
   active:
     timeout: 10