diff --git a/data/configuration.yaml b/data/configuration.yaml
index 73a3873..2005023 100644
--- a/data/configuration.yaml
+++ b/data/configuration.yaml
@@ -18,18 +18,80 @@ device_options:
   legacy: false
 devices:
   '0x000b57fffef3ffd4':
-    friendly_name: officeLight1
+    friendly_name: FF_Office_Light_2
   '0x90fd9ffffe82e267':
-    friendly_name: '0x90fd9ffffe82e267'
+    friendly_name: FF_Office_Colour_Light_1
   '0x90fd9ffffe15b9ad':
-    friendly_name: '0x90fd9ffffe15b9ad'
+    friendly_name: FF_Office_Light_1
   '0x90fd9ffffef25e70':
-    friendly_name: '0x90fd9ffffef25e70'
+    friendly_name: FF_Landing_Light_1
   '0xd0cf5efffe21666e':
-    friendly_name: '0xd0cf5efffe21666e'
+    friendly_name: FF_Landing_Colour_Light_1
   '0x000d6ffffe2667e6':
-    friendly_name: '0x000d6ffffe2667e6'
+    friendly_name: FF_Landing_Light_2
   '0x142d41fffe403706':
     friendly_name: '0x142d41fffe403706'
   '0x00158d0002b546d7':
-    friendly_name: office_environment
+    friendly_name: FF_Office_Environment
+  '0x90fd9ffffe04dc91':
+    friendly_name: GF_Hallway_Light_1
+  '0x90fd9ffffe030a12':
+    friendly_name: GF_Hallway_Light_2
+  '0x000b57fffea800ae':
+    friendly_name: GF_Hallway_Colour_Light_1
+  '0x90fd9ffffe926f99':
+    friendly_name: GF_Hallway_Colour_Light_2
+  '0x000b57fffe1435fe':
+    friendly_name: FF_Bedroom_Light_1
+    description: Boxroom Light
+  '0x00158d000257b724':
+    friendly_name: FF_Landing_Motion
+  '0x00158d0002c8ee66':
+    friendly_name: FF_Landing_Environment
+  '0x90fd9ffffeea8d91':
+    friendly_name: FF_MasterBedroom_Light_1
+  '0x90fd9ffffedccd72':
+    friendly_name: FF_MasterBedroom_Light_2
+  '0x90fd9ffffee7893c':
+    friendly_name: FF_MasterBedroom_Colour_Light_1
+  '0x90fd9ffffe90f049':
+    friendly_name: GF_Dining_Colour_Light_1
+  '0x90fd9ffffe927c10':
+    friendly_name: GF_Dining_Colour_Light_2
+  '0x84ba20fffe5533a6':
+    friendly_name: GF_Dining_Colour_Lamp_1
+  '0x90fd9ffffe052ad9':
+    friendly_name: GF_Living_Light_1
+  '0x90fd9ffffe3e42c8':
+    friendly_name: GF_Living_Colour_Light_1
+  '0x000b57fffee2b487':
+    friendly_name: GF_Living_Light_2
+  '0x000b57fffed87190':
+    friendly_name: '0x000b57fffed87190'
+  '0x000b57fffed89bc9':
+    friendly_name: '0x000b57fffed89bc9'
+  '0x000b57fffed93d01':
+    friendly_name: '0x000b57fffed93d01'
+  '0x000b57fffed859f2':
+    friendly_name: '0x000b57fffed859f2'
+  '0x000b57fffed704d0':
+    friendly_name: '0x000b57fffed704d0'
+  '0x000b57fffed54a02':
+    friendly_name: '0x000b57fffed54a02'
+  '0x000b57fffed70270':
+    friendly_name: '0x000b57fffed70270'
+  '0x00158d0002bf99ad':
+    friendly_name: GF_Hall_Environment
+  '0x000b57fffed74a8c':
+    friendly_name: '0x000b57fffed74a8c'
+  '0x000b57fffed6ff1f':
+    friendly_name: '0x000b57fffed6ff1f'
+  '0x00158d000275355b':
+    friendly_name: GF_Living_Environment
+groups:
+  '1':
+    friendly_name: FF_Landing
+    devices:
+      - 0xd0cf5efffe21666e/1
+      - 0x000d6ffffe2667e6/1
+      - 0x90fd9ffffef25e70/1