diff --git a/app/boards/shields/sofle/Kconfig.defconfig b/app/boards/shields/sofle/Kconfig.defconfig
index 4eb3d743b86..97b0bc5480a 100644
--- a/app/boards/shields/sofle/Kconfig.defconfig
+++ b/app/boards/shields/sofle/Kconfig.defconfig
@@ -45,8 +45,8 @@ endif # LVGL
 
 if ZMK_RGB_UNDERGLOW
 
-config WS2812_STRIP
-    default y
+# config WS2812_STRIP
+#     default y
 endif
 
 endif
diff --git a/app/boards/shields/splitkb_aurora_corne/Kconfig.defconfig b/app/boards/shields/splitkb_aurora_corne/Kconfig.defconfig
index d3ac6c77e26..f4011fcfacd 100644
--- a/app/boards/shields/splitkb_aurora_corne/Kconfig.defconfig
+++ b/app/boards/shields/splitkb_aurora_corne/Kconfig.defconfig
@@ -17,7 +17,7 @@ config ZMK_SPLIT
     default y
 
 config ZMK_RGB_UNDERGLOW
-    select WS2812_STRIP
+    # select WS2812_STRIP
     select SPI
 
 config ZMK_DISPLAY
diff --git a/app/boards/shields/splitkb_aurora_helix/Kconfig.defconfig b/app/boards/shields/splitkb_aurora_helix/Kconfig.defconfig
index df32b83b237..91537711e90 100644
--- a/app/boards/shields/splitkb_aurora_helix/Kconfig.defconfig
+++ b/app/boards/shields/splitkb_aurora_helix/Kconfig.defconfig
@@ -17,7 +17,7 @@ config ZMK_SPLIT
     default y
 
 config ZMK_RGB_UNDERGLOW
-    select WS2812_STRIP
+    # select WS2812_STRIP
     select SPI
 
 if ZMK_DISPLAY
diff --git a/app/boards/shields/splitkb_aurora_lily58/Kconfig.defconfig b/app/boards/shields/splitkb_aurora_lily58/Kconfig.defconfig
index 861db44f0b1..e4e3f6894cd 100644
--- a/app/boards/shields/splitkb_aurora_lily58/Kconfig.defconfig
+++ b/app/boards/shields/splitkb_aurora_lily58/Kconfig.defconfig
@@ -17,7 +17,7 @@ config ZMK_SPLIT
     default y
 
 config ZMK_RGB_UNDERGLOW
-    select WS2812_STRIP
+    # select WS2812_STRIP
     select SPI
 
 config ZMK_DISPLAY
diff --git a/app/boards/shields/splitkb_aurora_sofle/Kconfig.defconfig b/app/boards/shields/splitkb_aurora_sofle/Kconfig.defconfig
index 172548e87d7..8dc5d808131 100644
--- a/app/boards/shields/splitkb_aurora_sofle/Kconfig.defconfig
+++ b/app/boards/shields/splitkb_aurora_sofle/Kconfig.defconfig
@@ -17,7 +17,7 @@ config ZMK_SPLIT
     default y
 
 config ZMK_RGB_UNDERGLOW
-    select WS2812_STRIP
+    # select WS2812_STRIP
     select SPI
 
 if ZMK_DISPLAY
diff --git a/app/boards/shields/splitkb_aurora_sweep/Kconfig.defconfig b/app/boards/shields/splitkb_aurora_sweep/Kconfig.defconfig
index 6a0e37286c9..1f429867f87 100644
--- a/app/boards/shields/splitkb_aurora_sweep/Kconfig.defconfig
+++ b/app/boards/shields/splitkb_aurora_sweep/Kconfig.defconfig
@@ -17,7 +17,7 @@ config ZMK_SPLIT
     default y
 
 config ZMK_RGB_UNDERGLOW
-    select WS2812_STRIP
+    # select WS2812_STRIP
     select SPI
 
 config ZMK_DISPLAY
diff --git a/app/boards/shields/zmk_uno/Kconfig.defconfig b/app/boards/shields/zmk_uno/Kconfig.defconfig
index 95602ca73f9..b348cf4eb40 100644
--- a/app/boards/shields/zmk_uno/Kconfig.defconfig
+++ b/app/boards/shields/zmk_uno/Kconfig.defconfig
@@ -17,7 +17,7 @@ config SHIELD_SSD1306_128X32
     select ZMK_DISPLAY
 
 config ZMK_RGB_UNDERGLOW
-    select WS2812_STRIP
+    # select WS2812_STRIP
     select SPI
 
 config ZMK_PM_SOFT_OFF
diff --git a/app/src/behavior.c b/app/src/behavior.c
index 9b20c706265..d1b32387b82 100644
--- a/app/src/behavior.c
+++ b/app/src/behavior.c
@@ -42,13 +42,13 @@ const struct device *z_impl_behavior_get_binding(const char *name) {
     }
 
     STRUCT_SECTION_FOREACH(zmk_behavior_ref, item) {
-        if (z_device_is_ready(item->device) && item->device->name == name) {
+        if (device_is_ready(item->device) && item->device->name == name) {
             return item->device;
         }
     }
 
     STRUCT_SECTION_FOREACH(zmk_behavior_ref, item) {
-        if (z_device_is_ready(item->device) && strcmp(item->device->name, name) == 0) {
+        if (device_is_ready(item->device) && strcmp(item->device->name, name) == 0) {
             return item->device;
         }
     }
diff --git a/app/west.yml b/app/west.yml
index ce0785e3349..0dd5029c317 100644
--- a/app/west.yml
+++ b/app/west.yml
@@ -6,8 +6,8 @@ manifest:
       url-base: https://github.com/zmkfirmware
   projects:
     - name: zephyr
-      remote: zmkfirmware
-      revision: v3.5.0+zmk-fixes
+      remote: zephyr
+      revision: v3.7.0
       clone-depth: 1
       import:
         name-blocklist: