diff --git a/data/configuration.yaml b/data/configuration.yaml
index e1a80bc..cfdbd04 100644
--- a/data/configuration.yaml
+++ b/data/configuration.yaml
@@ -1,7 +1,9 @@
-homeassistant: false
-permit_join: true
-frontend: true
-availability: true
+homeassistant:
+  enabled: false
+frontend:
+  enabled: true
+availability:
+  enabled: true
 mqtt:
   base_topic: zigbee2mqtt
   server: mqtt://mqtt.blu3cat
@@ -12,12 +14,8 @@ serial:
   baudrate: 115200
 advanced:
   output: attribute_and_json
-  homeassistant_legacy_entity_attributes: false
-  legacy_api: false
-  legacy_availability_payload: false
-  log_level: error
-device_options:
-  legacy: false
+  log_level: debug
+device_options: {}
 devices:
   '0x000b57fffef3ffd4':
     friendly_name: FF_Office_Light_2
@@ -70,14 +68,6 @@ devices:
     transition: 0.7
     color_sync: true
     state_action: true
-  '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':
@@ -107,8 +97,6 @@ devices:
   '0x142d41fffe403706':
     friendly_name: FF_Office_Control
   '0x00158d0002f8cfdd':
-    friendly_name: GF_Hallway_Motion_1
-  '0x00158d0002ec7c5f':
     friendly_name: GF_Kitchen_Motion_1
   '0x00158d0002f8e603':
     friendly_name: GF_LivingDining_Motion_1
@@ -116,8 +104,6 @@ devices:
     friendly_name: FF_MasterBedroom_Control
   '0x142d41fffe2713ff':
     friendly_name: GF_Kitchen_Control
-  '0x142d41fffe23c32b':
-    friendly_name: FF_Bedroom_Control
   '0x142d41fffe24310e':
     friendly_name: GF_LivingDining_Control
   '0x8cf681fffe1bdb9b':
@@ -130,92 +116,67 @@ devices:
     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'
+  '0x90fd9ffffe052ad9':
+    friendly_name: GF_Living_Light_1
+  '0x403059fffee7be33':
+    friendly_name: '0x403059fffee7be33'
+  '0x403059fffef40f02':
+    friendly_name: '0x403059fffef40f02'
+  '0x0c2a6ffffe27ed5e':
+    friendly_name: '0x0c2a6ffffe27ed5e'
+  '0x0c2a6ffffe280b6f':
+    friendly_name: '0x0c2a6ffffe280b6f'
+  '0x0c2a6ffffe27fbeb':
+    friendly_name: '0x0c2a6ffffe27fbeb'
+  '0x0c2a6ffffe27f047':
+    friendly_name: '0x0c2a6ffffe27f047'
+  '0x0c2a6ffffe27f061':
+    friendly_name: '0x0c2a6ffffe27f061'
+  '0xa4c1387340c6495b':
+    friendly_name: GF_Kitchen_Cabinet_Light
+  '0xa4c13855b908d0c9':
+    friendly_name: GF_Kitchen_Larder_Light
+    transition: 1
+    debounce: 1
+    homeassistant: {}
+    optimistic: true
+    state_action: true
+  '0x583bc2fffe0b6b9b':
+    friendly_name: GF_Kitchen_Larder_Door
+  '0xd44867fffed32c0e':
+    friendly_name: GF_Kitchen_Rear_Door
+  '0x00158d008b80d4f1':
+    friendly_name: GF_Kitchen_Environment
+  '0x00158d008b861050':
+    friendly_name: GF_Hallway_Motion_1
+  '0x142d41fffe23c32b':
+    friendly_name: FF_Bedroom_Control
 groups:
   '1':
     friendly_name: FF_Landing
-    devices:
-      - 0xd0cf5efffe21666e/1
-      - 0x000d6ffffe2667e6/1
-      - 0x90fd9ffffef25e70/1
   '2':
     friendly_name: FF_Office
-    devices:
-      - 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:
-      - 0x000b57fffed54a02/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
+  '13':
+    friendly_name: FF_Bedroom
+version: 4
+blocklist:
+  - '0x001e5e0902671268'
+  - '0x001e5e090265082d'