diff --git a/config/lovelace/advanced_dashboard/10_system.yaml b/config/lovelace/advanced_dashboard/10_system.yaml
index 6b6adec..d152fe2 100644
--- a/config/lovelace/advanced_dashboard/10_system.yaml
+++ b/config/lovelace/advanced_dashboard/10_system.yaml
@@ -49,6 +49,8 @@ cards:
               entity: sensor.front_door_battery
             - type: custom:battery-entity-row
               entity: sensor.living_room_right_window_battery
+            - type: custom:battery-entity-row
+              entity: sensor.aqara_tvoc_battery
             - type: divider
             - type: custom:battery-entity-row
               entity: sensor.bedroom_door_battery
@@ -102,6 +104,7 @@ cards:
                 - sensor.living_room_opple_lqi
                 - sensor.desk_switch_lqi
                 - sensor.living_room_right_window_lqi
+                - sensor.aqara_tvoc_lqi
                 - type: divider
                 - sensor.bedside_switch_lqi
                 # - sensor.bed_led_lqi
diff --git a/config/lovelace/decluttering_templates/cards/aqara_tvoc_card.yaml b/config/lovelace/decluttering_templates/cards/aqara_tvoc_card.yaml
new file mode 100644
index 0000000..7f78325
--- /dev/null
+++ b/config/lovelace/decluttering_templates/cards/aqara_tvoc_card.yaml
@@ -0,0 +1,34 @@
+aqara_tvoc_card:
+  card:
+    type: vertical-stack
+    cards:
+      - type: "custom:mini-graph-card"
+        entities:
+          - sensor.aqara_tvoc_voc
+        cache: false
+        group_by: hour
+        hours_to_show: 72
+        line_width: 2
+        show:
+          average: true
+          extrema: true
+          fill: true
+
+      - type: horizontal-stack
+        cards:
+          - type: "custom:mini-graph-card"
+            name: Temperature
+            entities:
+              - sensor.aqara_tvoc_temperature
+            font_size: 75
+            line_color: "var(--color-blue)"
+            line_width: 6
+            hours_to_show: 72
+          - type: "custom:mini-graph-card"
+            name: Humidity
+            entities:
+              - sensor.aqara_tvoc_humidity
+            font_size: 75
+            line_color: "var(--color-blue)"
+            line_width: 6
+            hours_to_show: 72
diff --git a/config/lovelace/home_dashboard/living_room_dashboard.yaml b/config/lovelace/home_dashboard/living_room_dashboard.yaml
index 802aff0..0dec051 100644
--- a/config/lovelace/home_dashboard/living_room_dashboard.yaml
+++ b/config/lovelace/home_dashboard/living_room_dashboard.yaml
@@ -34,6 +34,9 @@
               - type: custom:button-card
                 template: v3_badge_humidity
                 entity: sensor.multisensor_6_relative_humidity
+              - type: custom:button-card
+                template: v3_badge
+                entity: sensor.aqara_tvoc_voc
               - type: custom:button-card
                 template: v3_badge_icon
                 entity: binary_sensor.living_room_right_window
diff --git a/config/lovelace/popup_cards.yaml b/config/lovelace/popup_cards.yaml
index c291ddd..f122da8 100644
--- a/config/lovelace/popup_cards.yaml
+++ b/config/lovelace/popup_cards.yaml
@@ -393,6 +393,12 @@ sensor.guest_bedroom_weather_humidity:
       - left_name: Temperature
       - right_entity: sensor.guest_bedroom_weather_pressure
 
+sensor.aqara_tvoc_voc:
+  title: VOC
+  card:
+    type: custom:decluttering-card
+    template: aqara_tvoc_card
+
 sensor.purifier_air_quality:
   title: Bedroom air quality
   card:
diff --git a/config/packages/modules/climate/internal_sensors.yaml b/config/packages/modules/climate/internal_sensors.yaml
index 2055446..da95337 100644
--- a/config/packages/modules/climate/internal_sensors.yaml
+++ b/config/packages/modules/climate/internal_sensors.yaml
@@ -238,6 +238,45 @@ sensor:
     name: "Terrarium weather LQI"
     state_topic: "z2m_deconz/terrarium_weather"
     availability_topic: "z2m_deconz/bridge/state"
-    icon: "mdi:signal"
+    unit_of_measurement: "lqi"
+    device_class: "signal_strength"
+    value_template: "{{ value_json.linkquality }}"
+
+
+
+  # Terrarium weather sensor
+  - platform: mqtt
+    name: "Aqara TVOC temperature"
+    state_topic: "z2m_deconz/aqara_tvoc"
+    availability_topic: "z2m_deconz/bridge/state"
+    unit_of_measurement: "°C"
+    device_class: "temperature"
+    value_template: "{{ value_json.temperature }}"
+  - platform: mqtt
+    name: "Aqara TVOC humidity"
+    state_topic: "z2m_deconz/aqara_tvoc"
+    availability_topic: "z2m_deconz/bridge/state"
+    unit_of_measurement: "%"
+    device_class: "humidity"
+    value_template: "{{ value_json.humidity }}"
+  - platform: mqtt
+    name: "Aqara TVOC voc"
+    state_topic: "z2m_deconz/aqara_tvoc"
+    availability_topic: "z2m_deconz/bridge/state"
+    unit_of_measurement: "ppb"
+    device_class: "volatile_organic_compounds"
+    value_template: "{{ value_json.voc }}"
+  - platform: mqtt
+    name: "Aqara TVOC battery"
+    state_topic: "z2m_deconz/aqara_tvoc"
+    availability_topic: "z2m_deconz/bridge/state"
+    unit_of_measurement: "%"
+    device_class: "battery"
+    value_template: "{{ value_json.battery }}"
+  - platform: mqtt
+    name: "Aqara TVOC LQI"
+    state_topic: "z2m_deconz/aqara_tvoc"
+    availability_topic: "z2m_deconz/bridge/state"
+    device_class: "signal_strength"
     unit_of_measurement: "lqi"
     value_template: "{{ value_json.linkquality }}"