diff --git a/config/lovelace/advanced_dashboard/02_lights.yaml b/config/lovelace/advanced_dashboard/02_lights.yaml
index 993a651..f1ea3d3 100644
--- a/config/lovelace/advanced_dashboard/02_lights.yaml
+++ b/config/lovelace/advanced_dashboard/02_lights.yaml
@@ -246,8 +246,7 @@ cards:
           show_header_toggle: false
           entities:
             - type: custom:decluttering-card
-              template: light_with_fade_and_switch
+              template: light_with_update_and_lqi
               variables:
-                - light: light.light_lohas_6
-                - fade: switch.light_lohas_6
-                - wifi: sensor.light_lohas_6_wifi
+                - light: light.tradfri_large
+                - lqi: sensor.tradfri_large_lqi
diff --git a/config/lovelace/hallway_dashboard/at_home_dashboard.yaml b/config/lovelace/hallway_dashboard/at_home_dashboard.yaml
index f5236f7..32de98f 100644
--- a/config/lovelace/hallway_dashboard/at_home_dashboard.yaml
+++ b/config/lovelace/hallway_dashboard/at_home_dashboard.yaml
@@ -241,7 +241,7 @@ card:
               name: Entrance
             - type: custom:button-card
               template: v3_tablet_button
-              entity: light.light_lohas_6
+              entity: light.tradfri_large
               name: G. Bedroom
 
         - type: custom:decluttering-card
diff --git a/config/lovelace/hallway_dashboard/coming_home_dashboard.yaml b/config/lovelace/hallway_dashboard/coming_home_dashboard.yaml
index 2edd485..e1bee25 100644
--- a/config/lovelace/hallway_dashboard/coming_home_dashboard.yaml
+++ b/config/lovelace/hallway_dashboard/coming_home_dashboard.yaml
@@ -238,7 +238,7 @@ card:
               name: Entrance
             - type: custom:button-card
               template: v3_tablet_button
-              entity: light.light_lohas_6
+              entity: light.tradfri_large
               name: G. Bedroom
 
         - type: custom:decluttering-card
diff --git a/config/lovelace/home_dashboard/guest_bedroom_dashboard.yaml b/config/lovelace/home_dashboard/guest_bedroom_dashboard.yaml
index 62b8fa2..bbcafb8 100644
--- a/config/lovelace/home_dashboard/guest_bedroom_dashboard.yaml
+++ b/config/lovelace/home_dashboard/guest_bedroom_dashboard.yaml
@@ -49,7 +49,7 @@
             cards:
               - type: custom:button-card
                 template: v3_button_light
-                entity: light.light_lohas_6
+                entity: light.tradfri_large
                 name: Night stand
               - type: custom:button-card
                 template: v3_button
diff --git a/config/packages/modes/house_mode.yaml b/config/packages/modes/house_mode.yaml
index 2709ad3..39f5919 100644
--- a/config/packages/modes/house_mode.yaml
+++ b/config/packages/modes/house_mode.yaml
@@ -102,7 +102,7 @@ automation:
       to: "night"
     action:
       - service: light.turn_off
-        entity_id: light.light_lohas_6
+        entity_id: light.tradfri_large
 
   - alias: House mode · Set to day
     trigger:
diff --git a/config/packages/modules/lighting/areas/guest_bedroom.yaml b/config/packages/modules/lighting/areas/guest_bedroom.yaml
index b21603d..fd0c9ff 100644
--- a/config/packages/modules/lighting/areas/guest_bedroom.yaml
+++ b/config/packages/modules/lighting/areas/guest_bedroom.yaml
@@ -5,14 +5,14 @@ script:
         data:
           scene_id: guest_bedroom_before_confirm
           snapshot_entities:
-            - light.light_lohas_6
+            - light.tradfri_large
       - service: light.turn_on
-        entity_id: light.light_lohas_6
+        entity_id: light.tradfri_large
         data:
           rgb_color: [110, 255, 0]
       - delay: 00:00:02
       - service: light.turn_on
-        entity_id: light.light_lohas_6
+        entity_id: light.tradfri_large
         data_template:
           color_temp: "{{ states('input_number.guest_bedroom_light_temp') }}"
       - service: scene.turn_on
diff --git a/config/packages/modules/lighting/setup/groups.yaml b/config/packages/modules/lighting/setup/groups.yaml
index ed27561..7a3a1fd 100644
--- a/config/packages/modules/lighting/setup/groups.yaml
+++ b/config/packages/modules/lighting/setup/groups.yaml
@@ -142,7 +142,7 @@ light:
       - light.master_bedroom
       - light.kitchen
       - light.hallway
-      - light.light_lohas_6
+      - light.tradfri_large
 
 automation:
   - alias: Lighting · Sync Kitchen Main states
@@ -270,5 +270,6 @@ homeassistant:
       icon: bha:ceiling-spot-lamp
 
     # Guest Bedroom
-    light.light_lohas_6:
+    light.tradfri_large:
       icon: bha:table-lamp-variant
+      name: Night stand
diff --git a/config/packages/modules/lighting/setup/mqtt.yaml b/config/packages/modules/lighting/setup/mqtt.yaml
index 34f7fad..d12df7d 100644
--- a/config/packages/modules/lighting/setup/mqtt.yaml
+++ b/config/packages/modules/lighting/setup/mqtt.yaml
@@ -12,6 +12,18 @@ mqtt:
       max_mireds: 500
       min_mireds: 150
 
+    - name: "tradfri_large"
+      state_topic: "z2m_deconz/tradfri_large"
+      availability_topic: "z2m_deconz/bridge/state"
+      brightness: true
+      color_temp: true
+      xy: false
+      schema: "json"
+      command_topic: "z2m_deconz/tradfri_large/set"
+      brightness_scale: 254
+      max_mireds: 500
+      min_mireds: 150
+
     - name: "light_le_1"
       state_topic: "tele/light_le_1/STATE"
       state_value_template: "{{ value_json.POWER }}"
@@ -175,6 +187,13 @@ mqtt:
       unit_of_measurement: "lqi"
       device_class: "signal_strength"
 
+    - name: "tradfri_large_lqi"
+      state_topic: "z2m_deconz/tradfri_large"
+      availability_topic: "z2m_deconz/bridge/state"
+      value_template: "{{ value_json.linkquality }}"
+      unit_of_measurement: "lqi"
+      device_class: "signal_strength"
+
     - name: "light_le_1_wifi"
       availability_topic: "tele/light_le_1/LWT"
       device_class: signal_strength
diff --git a/config/packages/routines/good_night.yaml b/config/packages/routines/good_night.yaml
index bef8827..abc1dd7 100644
--- a/config/packages/routines/good_night.yaml
+++ b/config/packages/routines/good_night.yaml
@@ -40,7 +40,7 @@ script:
           - light.kitchen_secondary
           - light.hallway_main
           - light.hallway_entrance
-          - light.light_lohas_6
+          - light.tradfri_large
           - media_player.nvidia_shield
           - media_player.living_room_tv
           - switch.cadmium