diff --git a/blueprints/automation/BoGu5/kea BILRESA scroll wheel (sensors for scroll, events for press).yaml b/blueprints/automation/BoGu5/kea BILRESA scroll wheel (sensors for scroll, events for press).yaml
index 1a3911f2..9c83c222 100644
--- a/blueprints/automation/BoGu5/kea BILRESA scroll wheel (sensors for scroll, events for press).yaml	
+++ b/blueprints/automation/BoGu5/kea BILRESA scroll wheel (sensors for scroll, events for press).yaml	
@@ -61,8 +61,8 @@ blueprint:
               - 'lights: color hue only'
               - 'media: volume control'
               multiple: false
-              sort: false
               custom_value: false
+              sort: false
     channel2_section:
       name: Kanaal 2
       collapsed: true
@@ -111,8 +111,8 @@ blueprint:
               - 'lights: color hue only'
               - 'media: volume control'
               multiple: false
-              sort: false
               custom_value: false
+              sort: false
     channel3_section:
       name: Kanaal 3
       collapsed: true
@@ -161,8 +161,8 @@ blueprint:
               - 'lights: color hue only'
               - 'media: volume control'
               multiple: false
-              sort: false
               custom_value: false
+              sort: false
     global_section:
       name: Globale instellingen
       collapsed: true
diff --git a/blueprints/automation/jhol-byte/Ikea_bilresa_scroll_wheel.yaml b/blueprints/automation/jhol-byte/Ikea_bilresa_scroll_wheel.yaml
index 687b7553..953ac255 100644
--- a/blueprints/automation/jhol-byte/Ikea_bilresa_scroll_wheel.yaml
+++ b/blueprints/automation/jhol-byte/Ikea_bilresa_scroll_wheel.yaml
@@ -80,8 +80,8 @@ blueprint:
               - 'dynamic: choose from input_select'
               - user defined
               multiple: false
-              sort: false
               custom_value: false
+              sort: false
           default: 'lights: dim'
           name: 'Channel 1: Scroll wheel mode'
           description: Select attribute of target entity controlled by scroll wheel
@@ -110,8 +110,8 @@ blueprint:
               - relaxed
               - instant
               multiple: false
-              sort: false
               custom_value: false
+              sort: false
           default: relaxed
           name: 'Channel 1: Scroll wheel evaluation mode'
           description: '<relaxed>: one action call after scrolling
@@ -200,8 +200,8 @@ blueprint:
               - 'dynamic: choose from input_select'
               - user defined
               multiple: false
-              sort: false
               custom_value: false
+              sort: false
           default: 'lights: dim'
           name: 'Channel 2: Scroll wheel mode'
           description: Select attribute of target entity controlled by scroll wheel
@@ -230,8 +230,8 @@ blueprint:
               - relaxed
               - instant
               multiple: false
-              sort: false
               custom_value: false
+              sort: false
           default: relaxed
           name: 'Channel 2: Scroll wheel evaluation mode'
           description: '- <relaxed>: one action call after scrolling
@@ -320,8 +320,8 @@ blueprint:
               - 'dynamic: choose from input_select'
               - user defined
               multiple: false
-              sort: false
               custom_value: false
+              sort: false
           default: 'lights: dim'
           name: 'Channel 3: Scroll wheel mode'
           description: Select attribute of target entity controlled by scroll wheel
@@ -350,8 +350,8 @@ blueprint:
               - relaxed
               - instant
               multiple: false
-              sort: false
               custom_value: false
+              sort: false
           default: relaxed
           name: 'Channel 3: Scroll wheel evaluation mode'
           description: '- <relaxed>: one action call after scrolling
diff --git a/blueprints/automation/mcinnes01/ikea-e2490-bilresa-scroll-wheel.yaml b/blueprints/automation/mcinnes01/ikea-e2490-bilresa-scroll-wheel.yaml
index ae7fefd3..dc202692 100644
--- a/blueprints/automation/mcinnes01/ikea-e2490-bilresa-scroll-wheel.yaml
+++ b/blueprints/automation/mcinnes01/ikea-e2490-bilresa-scroll-wheel.yaml
@@ -50,8 +50,8 @@ blueprint:
           - label: Hue (light)
             value: hue
           multiple: false
-          sort: false
           custom_value: false
+          sort: false
     volume_target:
       name: Volume target (media_player)
       default:
diff --git a/blueprints/automation/stone13/ikea_bilresa_atomic_v1.yaml b/blueprints/automation/stone13/ikea_bilresa_atomic_v1.yaml
index 5ce01c29..022a174e 100644
--- a/blueprints/automation/stone13/ikea_bilresa_atomic_v1.yaml
+++ b/blueprints/automation/stone13/ikea_bilresa_atomic_v1.yaml
@@ -45,8 +45,8 @@ blueprint:
           - label: Presets (Work / Cozy)
             value: preset
           multiple: false
-          sort: false
           custom_value: false
+          sort: false
     scroll_logic_4_5:
       name: Scroll Zone 2 (Sensors 4 & 5)
       default: kelvin
@@ -62,8 +62,8 @@ blueprint:
           - label: Presets (Work / Cozy)
             value: preset
           multiple: false
-          sort: false
           custom_value: false
+          sort: false
     scroll_logic_7_8:
       name: Scroll Zone 3 (Sensors 7 & 8)
       default: preset
@@ -79,8 +79,8 @@ blueprint:
           - label: Presets (Work / Cozy)
             value: preset
           multiple: false
-          sort: false
           custom_value: false
+          sort: false
     btn1_double:
       name: 'Button 1: Double Click Action'
       default: set_bright
@@ -98,8 +98,8 @@ blueprint:
           - label: -> No Action
             value: none
           multiple: false
-          sort: false
           custom_value: false
+          sort: false
     btn1_hold:
       name: 'Button 1: Hold Action'
       default: set_dim
@@ -115,8 +115,8 @@ blueprint:
           - label: -> No Action
             value: none
           multiple: false
-          sort: false
           custom_value: false
+          sort: false
     btn2_double:
       name: 'Button 2: Double Click Action'
       default: set_cold
@@ -134,8 +134,8 @@ blueprint:
           - label: -> No Action
             value: none
           multiple: false
-          sort: false
           custom_value: false
+          sort: false
     btn2_hold:
       name: 'Button 2: Hold Action'
       default: set_warm
@@ -151,8 +151,8 @@ blueprint:
           - label: -> No Action
             value: none
           multiple: false
-          sort: false
           custom_value: false
+          sort: false
     btn3_double:
       name: 'Button 3: Double Click Action'
       default: set_bright
@@ -170,8 +170,8 @@ blueprint:
           - label: -> No Action
             value: none
           multiple: false
-          sort: false
           custom_value: false
+          sort: false
     btn3_hold:
       name: 'Button 3: Hold Action'
       default: set_dim
@@ -187,8 +187,8 @@ blueprint:
           - label: -> No Action
             value: none
           multiple: false
-          sort: false
           custom_value: false
+          sort: false
     step_pct:
       name: 'Step Size: Brightness (%)'
       default: 10
diff --git a/blueprints/automation/thetestspecimen/ikea-bilresa-scroll-wheel.yaml b/blueprints/automation/thetestspecimen/ikea-bilresa-scroll-wheel.yaml
index 931ac046..a8b1616d 100644
--- a/blueprints/automation/thetestspecimen/ikea-bilresa-scroll-wheel.yaml
+++ b/blueprints/automation/thetestspecimen/ikea-bilresa-scroll-wheel.yaml
@@ -190,8 +190,8 @@ blueprint:
               - label: Presets (Work / Cozy)
                 value: preset
               multiple: false
-              sort: false
               custom_value: false
+              sort: false
     group_button_1_single:
       name: 'Button 1: Single Click (Toggle On/Off)'
       icon: mdi:gesture-tap
@@ -335,8 +335,8 @@ blueprint:
               - label: Presets (Work / Cozy)
                 value: preset
               multiple: false
-              sort: false
               custom_value: false
+              sort: false
     group_button_2_single:
       name: 'Button 2: Single Click (Toggle On/Off)'
       icon: mdi:gesture-tap
@@ -480,8 +480,8 @@ blueprint:
               - label: Presets (Work / Cozy)
                 value: preset
               multiple: false
-              sort: false
               custom_value: false
+              sort: false
     group_button_3_single:
       name: 'Button 3: Single Click (Toggle On/Off)'
       icon: mdi:gesture-tap
diff --git a/zigbee2mqtt/state.json b/zigbee2mqtt/state.json
index 1c7be198..3bce6496 100644
--- a/zigbee2mqtt/state.json
+++ b/zigbee2mqtt/state.json
@@ -1,13 +1,13 @@
 {
     "0xffffb40e0607ace4": {
-        "energy": 18.42,
+        "energy": 18.44,
         "state": "ON",
         "led_brightness": 100,
         "countdown_to_turn_off": 0,
-        "voltage": 121.4,
+        "voltage": 121.1,
         "countdown_to_turn_on": 0,
         "ac_frequency": 60,
-        "power_factor": 0.59,
+        "power_factor": 0.44,
         "update": {
             "state": "idle",
             "installed_version": 268513381,
@@ -15,9 +15,9 @@
             "latest_source": "https://raw.githubusercontent.com/Koenkk/zigbee-OTA/master/images/ThirdReality/SmartPlug_Zigbee_PROD_OTA_V101_1.01.01.ota",
             "latest_release_notes": null
         },
-        "power": 85.7,
+        "power": 4,
         "linkquality": 120,
-        "current": 1.21,
+        "current": 0.07,
         "power_on_behavior": "on"
     },
     "0xffffb40e0607af27": {
@@ -27,10 +27,10 @@
         "led_brightness": 100,
         "countdown_to_turn_off": 0,
         "countdown_to_turn_on": 0,
-        "power": 4,
-        "current": 0.11,
+        "power": 87.7,
+        "current": 2.14,
         "energy": 37.14,
-        "power_factor": 0.35,
+        "power_factor": 0.31,
         "update": {
             "state": "idle",
             "installed_version": 268513381,
@@ -45,10 +45,10 @@
         "state": "ON",
         "led_brightness": 100,
         "countdown_to_turn_off": 0,
-        "voltage": 121.2,
+        "voltage": 121.5,
         "countdown_to_turn_on": 0,
-        "energy": 73.36,
-        "power_factor": 0.89,
+        "energy": 73.37,
+        "power_factor": 0.2,
         "ac_frequency": 60,
         "update": {
             "state": "idle",
@@ -58,8 +58,8 @@
             "latest_release_notes": null
         },
         "linkquality": 120,
-        "power": 83.7,
-        "current": 0.78,
+        "power": 80,
+        "current": 0.01,
         "power_on_behavior": "on"
     },
     "0xb40e060fffe031e3": {
@@ -74,13 +74,13 @@
         "led_brightness": 100,
         "countdown_to_turn_off": 0,
         "countdown_to_turn_on": 0,
-        "voltage": 122.5,
+        "voltage": 123,
         "state": "ON",
         "ac_frequency": 60,
-        "energy": 149.25,
-        "power": 98.4,
-        "current": 0.86,
-        "power_factor": 0.93,
+        "energy": 149.27,
+        "power": 3.8,
+        "current": 0.05,
+        "power_factor": 0.65,
         "update": {
             "state": "idle",
             "installed_version": 268513381,
@@ -95,13 +95,13 @@
         "led_brightness": 100,
         "countdown_to_turn_off": 0,
         "countdown_to_turn_on": 0,
-        "voltage": 120.8,
-        "energy": 70.87,
+        "voltage": 121.2,
+        "energy": 70.89,
         "state": "ON",
-        "power": 61.5,
-        "current": 0.66,
+        "power": 80,
+        "current": 0.79,
         "ac_frequency": 60,
-        "power_factor": 0.76,
+        "power_factor": 0.86,
         "update": {
             "state": "idle",
             "installed_version": 268513381,
@@ -119,7 +119,7 @@
         "energy": 9.86,
         "current": 0.01,
         "power": 0.1,
-        "power_factor": 0.13,
+        "power_factor": 0.11,
         "linkquality": 109,
         "update": {
             "state": "idle",
@@ -224,7 +224,7 @@
     },
     "0xb40e060fffe717c5": {
         "battery": 100,
-        "occupancy": true,
+        "occupancy": false,
         "tamper": false,
         "battery_low": false,
         "linkquality": 116,