diff --git a/configuration.yaml b/configuration.yaml
index 2778e83..a891a99 100644
--- a/configuration.yaml
+++ b/configuration.yaml
@@ -21,14 +21,13 @@
   filters:
     homeassistant:
       - '_SelectorDatagramTransport'
-  default: info
+  default: critical
   logs:
-    custom_components.hacs: debug
-    hacs: debug
-    queueman: debug
-    AIOGitHubAPI: debug
+    homeassistant.core: fatal
 
 recorder:
+  commit_interval: 5
+  purge_keep_days: 7
   exclude:
     domains:
       - group
@@ -39,6 +38,11 @@
       - script
       - light
       - camera
+      - updater
+      - weather
+      - device_tracker
+    entities:
+      - sun.sun
 
 history:
   exclude:
@@ -51,6 +55,11 @@
       - script
       - light
       - camera
+      - updater
+      - weather
+      - device_tracker
+    entities:
+      - sun.sun
 
 logbook:
   exclude:
@@ -63,6 +72,11 @@
       - script
       - light
       - camera
+      - updater
+      - weather
+      - device_tracker
+    entities:
+      - sun.sun
       
 frontend:
   themes: !include_dir_merge_named themes/
diff --git a/lights.yaml b/lights.yaml
index 381e0d2..d578741 100644
--- a/lights.yaml
+++ b/lights.yaml
@@ -33,10 +33,11 @@
     - light.kontor
     - light.sofabord
     - light.vetrineskab
-    - light.bryggers_indhak
+    - light.flowerpot
+    - light.bryggers_gruppe
     - light.gaestevaerelse
-    - light.niels_seng
-    - light.niels_loft
+    - light.niels_gruppe
+    - light.jens_gruppe
     - light.seng
     
 - platform: group
@@ -48,10 +49,12 @@
     - light.spisebord_gruppe
     - light.kontor
     - light.sofabord
+    - light.flowerpot
     - light.gaestevaerelse
-    - light.niels_seng
-    - light.niels_loft
+    - light.niels_gruppe
+    - light.jens_gruppe
     - light.seng
+    
 - platform: group
   name: Niels Gruppe
   entities:
diff --git a/template/aircondition.yaml b/template/aircondition.yaml
index 49a505b..cae9add 100644
--- a/template/aircondition.yaml
+++ b/template/aircondition.yaml
@@ -3,16 +3,19 @@
       state: '{{ (states.switch.aircondition_switch.attributes.current_consumption) | default(0) | float }}'
       unit_of_measurement: "W"
       device_class: power
+      state_class: measurement
 
     - name: AirCondition Spænding
       state: '{{ (states.switch.aircondition_switch.attributes.voltage) | default(0) | float }}'
       unit_of_measurement: "V"
       device_class: voltage
+      state_class: measurement
 
     - name: AirCondition Strøm
       state: '{{ (states.switch.aircondition_switch.attributes.current) | default(0) | float * 0.001  }}'
       unit_of_measurement: "A"
       device_class: current
+      state_class: measurement
       
     - name: AirCondition Power Factor
       state: | 
@@ -26,4 +29,5 @@
         {{ pf | round(2) }}
       unit_of_measurement: "%"
       device_class: power_factor
+      state_class: measurement
       
\ No newline at end of file
diff --git a/template/computer-plug.yaml b/template/computer-plug.yaml
index d56a4d8..5036eda 100644
--- a/template/computer-plug.yaml
+++ b/template/computer-plug.yaml
@@ -3,16 +3,19 @@
       state: '{{ (states.switch.computer_switch.attributes.voltage) | default(0)| float }}'
       unit_of_measurement: "V"
       device_class: voltage
+      state_class: measurement
     
     - name: Computer Strøm
       state: '{{ (states.switch.computer_switch.attributes.current) | default(0)| float * 0.001 }}'
       unit_of_measurement: "A"
       device_class: current
+      state_class: measurement
     
     - name: Computer Energi
       state: '{{ (states.switch.computer_switch.attributes.current_consumption) | default(0)| float }}'
       unit_of_measurement: "W"
       device_class: power
+      state_class: measurement
       
     - name: Computer Power Factor
       state: | 
@@ -26,3 +29,4 @@
         {{ pf | round(2) }}
       unit_of_measurement: "%"
       device_class: power_factor
+      state_class: measurement
diff --git a/template/opvaskemaskine.yaml b/template/opvaskemaskine.yaml
index 21bc8fb..2f77428 100644
--- a/template/opvaskemaskine.yaml
+++ b/template/opvaskemaskine.yaml
@@ -3,16 +3,19 @@
       state: '{{ (states.switch.opvaskemaskine_switch.attributes.voltage) | default(0)| float }}'
       unit_of_measurement: "V"
       device_class: voltage
+      state_class: measurement
     
     - name: Opvaskemaskine Strøm
       state: '{{ (states.switch.opvaskemaskine_switch.attributes.current) | default(0)| float * 0.001 }}'
       unit_of_measurement: "A"
       device_class: current
+      state_class: measurement
     
     - name: Opvaskemaskine Energi
       state: '{{ (states.switch.opvaskemaskine_switch.attributes.current_consumption) | default(0)| float }}'
       unit_of_measurement: "W"
       device_class: power
+      state_class: measurement
       
     - name: Opvaskemaskine Power Factor
       state: | 
@@ -26,4 +29,5 @@
         {{ pf | round(2) }}
       unit_of_measurement: "%"
       device_class: power_factor
+      state_class: measurement
       
\ No newline at end of file
diff --git a/template/teknikskab.yaml b/template/teknikskab.yaml
index e5ed833..3f1da8e 100644
--- a/template/teknikskab.yaml
+++ b/template/teknikskab.yaml
@@ -3,16 +3,19 @@
       state: '{{ (states.switch.teknikskab_switch.attributes.current_consumption) | default(0) | float }}'
       unit_of_measurement: "W"
       device_class: power
+      state_class: measurement
 
     - name: Teknikskab Spænding
       state: '{{ (states.switch.teknikskab_switch.attributes.voltage) | default(0) | float }}'
       unit_of_measurement: "V"
       device_class: voltage
+      state_class: measurement
 
     - name: Teknikskab Strøm
       state: '{{ (states.switch.teknikskab_switch.attributes.current) | default(0) | float * 0.001  }}'
       unit_of_measurement: "A"
       device_class: current
+      state_class: measurement
       
     - name: Teknikskab Power Factor
       state: | 
@@ -26,4 +29,5 @@
         {{ pf | round(2) }}
       unit_of_measurement: "%"
       device_class: power_factor
+      state_class: measurement
       
\ No newline at end of file
diff --git a/template/tv_baenk.yaml b/template/tv_baenk.yaml
index bc888a4..425e60c 100644
--- a/template/tv_baenk.yaml
+++ b/template/tv_baenk.yaml
@@ -3,16 +3,19 @@
       state: '{{ (states.switch.tv_baenk.attributes.voltage) | default(0) | float }}'
       unit_of_measurement: "V"
       device_class: voltage
+      state_class: measurement
     
     - name: TV Bænk Strøm
       state: '{{ (states.switch.tv_baenk.attributes.current) | default(0) | float * 0.001 }}'
       unit_of_measurement: "A"
       device_class: current
+      state_class: measurement
     
     - name: TV Bænk Energi
       state: '{{ (states.switch.tv_baenk.attributes.current_consumption) | default(0) | float }}'
       unit_of_measurement: "W"
       device_class: power
+      state_class: measurement
       
     - name: TV Bænk Power Factor
       state: | 
@@ -26,4 +29,5 @@
         {{ pf | round(2) }}
       unit_of_measurement: "%"
       device_class: power_factor
+      state_class: measurement
       
\ No newline at end of file