diff --git a/data/configuration.yaml b/data/configuration.yaml
index c4d8957..e1a80bc 100644
--- a/data/configuration.yaml
+++ b/data/configuration.yaml
@@ -46,10 +46,14 @@ devices:
     transition: 0.5
   '0x000b57fffea800ae':
     friendly_name: GF_Hallway_Colour_Light_1
-    transition: 0.5
+    transition: 1
+    color_sync: false
+    state_action: true
   '0x90fd9ffffe926f99':
     friendly_name: GF_Hallway_Colour_Light_2
-    transition: 0.5
+    transition: 1
+    color_sync: false
+    state_action: true
   '0x000b57fffe1435fe':
     friendly_name: FF_Bedroom_Light_1
     description: Boxroom Light
@@ -63,6 +67,9 @@ devices:
     friendly_name: FF_MasterBedroom_Light_2
   '0x90fd9ffffee7893c':
     friendly_name: FF_MasterBedroom_Colour_Light_1
+    transition: 0.7
+    color_sync: true
+    state_action: true
   '0x90fd9ffffe90f049':
     friendly_name: GF_Dining_Colour_Light_1
   '0x90fd9ffffe927c10':
@@ -99,8 +106,6 @@ devices:
     friendly_name: GF_Living_Environment
   '0x142d41fffe403706':
     friendly_name: FF_Office_Control
-  '0x000b57fffed61a7d':
-    friendly_name: '0x000b57fffed61a7d'
   '0x00158d0002f8cfdd':
     friendly_name: GF_Hallway_Motion_1
   '0x00158d0002ec7c5f':
@@ -109,8 +114,30 @@ devices:
     friendly_name: GF_LivingDining_Motion_1
   '0x142d41fffe403871':
     friendly_name: FF_MasterBedroom_Control
+  '0x142d41fffe2713ff':
+    friendly_name: GF_Kitchen_Control
   '0x142d41fffe23c32b':
-    friendly_name: '0x142d41fffe23c32b'
+    friendly_name: FF_Bedroom_Control
+  '0x142d41fffe24310e':
+    friendly_name: GF_LivingDining_Control
+  '0x8cf681fffe1bdb9b':
+    friendly_name: GF_Living_Dining_Control_2
+  '0x943469fffe635fa2':
+    friendly_name: '0x943469fffe635fa2'
+  '0x142d41fffe271c8f':
+    friendly_name: FF_Landing_Control
+  '0x142d41fffe21b54d':
+    friendly_name: FF_Hallway_Control_1
+  '0x142d41fffe40d5aa':
+    friendly_name: FF_Hallway_Control_2
+  '0x001e5e09025c7f1e':
+    friendly_name: '0x001e5e09025c7f1e'
+  '0x001e5e0902671268':
+    friendly_name: '0x001e5e0902671268'
+  '0x001e5e090265082d':
+    friendly_name: '0x001e5e090265082d'
+  '0x70b3d521e000cb73':
+    friendly_name: '0x70b3d521e000cb73'
 groups:
   '1':
     friendly_name: FF_Landing
@@ -151,18 +178,44 @@ groups:
   '7':
     friendly_name: GF_Kitchen
     devices:
-      - 0x000b57fffed89bc9/1
-      - 0x000b57fffed6ff1f/1
-      - 0x000b57fffed704d0/1
-      - 0x000b57fffed859f2/1
-      - 0x000b57fffed93d01/1
       - 0x000b57fffed54a02/1
-      - 0x000b57fffed61a7d/1
+      - 0x000b57fffed6ff1f/1
       - 0x000b57fffed70270/1
+      - 0x000b57fffed859f2/1
+      - 0x000b57fffed704d0/1
       - 0x000b57fffed74a8c/1
       - 0x000b57fffed87190/1
+      - 0x000b57fffed93d01/1
+      - 0x943469fffe635fa2/1
+      - 0x000b57fffed89bc9/1
   '8':
     friendly_name: GF_Hallway_Colour
     devices:
       - 0x000b57fffea800ae/1
       - 0x90fd9ffffe926f99/1
+  '9':
+    friendly_name: LivingDining
+    devices:
+      - 0x84ba20fffe5533a6/1
+      - 0x90fd9ffffe90f049/1
+      - 0x90fd9ffffe927c10/1
+      - 0x90fd9ffffe3e42c8/1
+      - 0x90fd9ffffe052ad9/1
+      - 0x000b57fffee2b487/1
+  '10':
+    friendly_name: GF_Living_Dining_Colour
+    devices:
+      - 0x84ba20fffe5533a6/1
+      - 0x90fd9ffffe90f049/1
+      - 0x90fd9ffffe927c10/1
+      - 0x90fd9ffffe3e42c8/1
+  '11':
+    friendly_name: HallwayLanding
+    devices:
+      - 0xd0cf5efffe21666e/1
+      - 0x90fd9ffffef25e70/1
+      - 0x000d6ffffe2667e6/1
+      - 0x000b57fffea800ae/1
+      - 0x90fd9ffffe030a12/1
+      - 0x90fd9ffffe04dc91/1
+      - 0x90fd9ffffe926f99/1