diff --git a/config/lovelace/advanced_dashboard/02_lights.yaml b/config/lovelace/advanced_dashboard/02_lights.yaml
index fcd6c18..993a651 100644
--- a/config/lovelace/advanced_dashboard/02_lights.yaml
+++ b/config/lovelace/advanced_dashboard/02_lights.yaml
@@ -162,7 +162,7 @@ cards:
               entities:
                 - light.hue_ambiance_6
                 - light.hue_ambiance_8
-                - light.neo_1
+                - light.tradfri_1
             - type: divider
             - type: custom:fold-entity-row
               entity: light.kitchen_secondary
diff --git a/config/packages/modules/lighting/color_mode.yaml b/config/packages/modules/lighting/color_mode.yaml
index 10d24a9..a5c9e74 100644
--- a/config/packages/modules/lighting/color_mode.yaml
+++ b/config/packages/modules/lighting/color_mode.yaml
@@ -66,7 +66,6 @@ automation:
         entity_id:
           - light.light_lohas_2 # living room ambient Secondary
           - light.hue_1 # Hallway
-          - light.neo_1 # Kitchen
         data:
           rgb_color: [0, 0, 255]
           brightness_pct: 100
diff --git a/config/packages/modules/lighting/setup/groups.yaml b/config/packages/modules/lighting/setup/groups.yaml
index d1163d6..ed27561 100644
--- a/config/packages/modules/lighting/setup/groups.yaml
+++ b/config/packages/modules/lighting/setup/groups.yaml
@@ -153,7 +153,7 @@ automation:
       - delay: "00:00:03"
       - service: mqtt.publish
         data:
-          topic: "z2m_deconz/neo_1/get"
+          topic: "z2m_deconz/tradfri_1/get"
           payload: ""
       - service: mqtt.publish
         data:
diff --git a/config/packages/modules/lighting/setup/mqtt.yaml b/config/packages/modules/lighting/setup/mqtt.yaml
index 927632d..34f7fad 100644
--- a/config/packages/modules/lighting/setup/mqtt.yaml
+++ b/config/packages/modules/lighting/setup/mqtt.yaml
@@ -1,5 +1,17 @@
 mqtt:
   light:
+    - name: "tradfri_1"
+      state_topic: "z2m_deconz/tradfri_1"
+      availability_topic: "z2m_deconz/bridge/state"
+      brightness: true
+      color_temp: true
+      xy: false
+      schema: "json"
+      command_topic: "z2m_deconz/tradfri_1/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 }}"
@@ -156,6 +168,13 @@ mqtt:
       min_mireds: 150
 
   sensor:
+    - name: "tradfri_1_lqi"
+      state_topic: "z2m_deconz/tradfri_1"
+      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
@@ -381,15 +400,7 @@ automation:
           payload: ""
       - service: mqtt.publish
         data:
-          topic: "z2m_deconz/ledvance_1/get"
-          payload: ""
-      - service: mqtt.publish
-        data:
-          topic: "z2m_deconz/neo_1/get"
-          payload: ""
-      - service: mqtt.publish
-        data:
-          topic: "z2m_deconz/neo_2/get"
+          topic: "z2m_deconz/tradfri_1/get"
           payload: ""
       - service: mqtt.publish
         data:
diff --git a/config/packages/modules/lighting/setup/neo.yaml b/config/packages/modules/lighting/setup/neo.yaml
index 7ea8280..693fd3e 100644
--- a/config/packages/modules/lighting/setup/neo.yaml
+++ b/config/packages/modules/lighting/setup/neo.yaml
@@ -1,40 +1,34 @@
-mqtt:
-  light:
-    - name: "neo_1"
-      state_topic: "z2m_deconz/neo_1"
-      availability_topic: "z2m_deconz/bridge/state"
-      brightness: true
-      color_temp: true
-      xy: true
-      hs: false
-      schema: "json"
-      command_topic: "z2m_deconz/neo_1/set"
-      brightness_scale: 254
-      max_mireds: 500
-      min_mireds: 150
-    - name: "neo_2"
-      state_topic: "z2m_deconz/neo_2"
-      availability_topic: "z2m_deconz/bridge/state"
-      brightness: true
-      color_temp: true
-      xy: true
-      hs: false
-      schema: "json"
-      command_topic: "z2m_deconz/neo_2/set"
-      brightness_scale: 254
-      max_mireds: 500
-      min_mireds: 150
+# mqtt:
+#   light:
+#     - name: "neo_1"
+#       state_topic: "z2m_deconz/neo_1"
+#       availability_topic: "z2m_deconz/bridge/state"
+#       brightness: true
+#       color_temp: true
+#       xy: true
+#       hs: false
+#       schema: "json"
+#       command_topic: "z2m_deconz/neo_1/set"
+#       brightness_scale: 254
+#       max_mireds: 500
+#       min_mireds: 150
+#     - name: "neo_2"
+#       state_topic: "z2m_deconz/neo_2"
+#       availability_topic: "z2m_deconz/bridge/state"
+#       brightness: true
+#       color_temp: true
+#       xy: true
+#       hs: false
+#       schema: "json"
+#       command_topic: "z2m_deconz/neo_2/set"
+#       brightness_scale: 254
+#       max_mireds: 500
+#       min_mireds: 150
 
-  sensor:
-    - name: "neo_1_lqi"
-      state_topic: "z2m_deconz/neo_1"
-      availability_topic: "z2m_deconz/bridge/state"
-      value_template: "{{ value_json.linkquality }}"
-      unit_of_measurement: "lqi"
-      device_class: "signal_strength"
-    - name: "pc_lqi"
-      state_topic: "z2m_deconz/neo_2"
-      availability_topic: "z2m_deconz/bridge/state"
-      value_template: "{{ value_json.linkquality }}"
-      unit_of_measurement: "lqi"
-      device_class: "signal_strength"
+#   sensor:
+#     - name: "neo_1_lqi"
+#       state_topic: "z2m_deconz/neo_1"
+#       availability_topic: "z2m_deconz/bridge/state"
+#       value_template: "{{ value_json.linkquality }}"
+#       unit_of_measurement: "lqi"
+#       device_class: "signal_strength"