diff --git a/data/configuration.yaml b/data/configuration.yaml
index 219d0e4..ae720dc 100644
--- a/data/configuration.yaml
+++ b/data/configuration.yaml
@@ -89,6 +89,14 @@ devices:
     friendly_name: GF_Living_Environment
   '0x142d41fffe403706':
     friendly_name: FF_Office_Control
+  '0x000b57fffed61a7d':
+    friendly_name: '0x000b57fffed61a7d'
+  '0x00158d0002f8cfdd':
+    friendly_name: GF_Hallway_Motion_1
+  '0x00158d0002ec7c5f':
+    friendly_name: GF_Kitchen_Motion_1
+  '0x00158d0002f8e603':
+    friendly_name: GF_LivingDining_Motion_1
 groups:
   '1':
     friendly_name: FF_Landing
@@ -102,3 +110,45 @@ groups:
       - 0x90fd9ffffe82e267/1
       - 0x90fd9ffffe15b9ad/1
       - 0x000b57fffef3ffd4/1
+  '3':
+    friendly_name: GF_Dining_Table
+    devices:
+      - 0x90fd9ffffe90f049/1
+      - 0x90fd9ffffe927c10/1
+  '4':
+    friendly_name: FF_MasterBedroom
+    devices:
+      - 0x90fd9ffffee7893c/1
+      - 0x90fd9ffffeea8d91/1
+      - 0x90fd9ffffedccd72/1
+  '5':
+    friendly_name: GF_Hallway
+    devices:
+      - 0x000b57fffea800ae/1
+      - 0x90fd9ffffe926f99/1
+      - 0x90fd9ffffe04dc91/1
+      - 0x90fd9ffffe030a12/1
+  '6':
+    friendly_name: GF_Living
+    devices:
+      - 0x90fd9ffffe052ad9/1
+      - 0x000b57fffee2b487/1
+      - 0x90fd9ffffe3e42c8/1
+  '7':
+    friendly_name: GF_Kitchen
+    devices:
+      - 0x000b57fffed89bc9/1
+      - 0x000b57fffed54a02/1
+      - 0x000b57fffed61a7d/1
+      - 0x000b57fffed6ff1f/1
+      - 0x000b57fffed70270/1
+      - 0x000b57fffed704d0/1
+      - 0x000b57fffed74a8c/1
+      - 0x000b57fffed859f2/1
+      - 0x000b57fffed87190/1
+      - 0x000b57fffed93d01/1
+  '8':
+    friendly_name: GF_Hallway_Colour
+    devices:
+      - 0x000b57fffea800ae/1
+      - 0x90fd9ffffe926f99/1