diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
index c3f08dda821..ee14425307c 100644
--- a/app/CMakeLists.txt
+++ b/app/CMakeLists.txt
@@ -36,8 +36,8 @@ target_sources(app PRIVATE src/events/sensor_event.c)
 target_sources(app PRIVATE src/events/mouse_button_state_changed.c)
 target_sources_ifdef(CONFIG_ZMK_WPM app PRIVATE src/events/wpm_state_changed.c)
 target_sources_ifdef(CONFIG_USB_DEVICE_STACK app PRIVATE src/events/usb_conn_state_changed.c)
-target_sources_ifdef(CONFIG_ZMK_BEHAVIOR_RESET app PRIVATE src/behaviors/behavior_reset.c)
-target_sources_ifdef(CONFIG_ZMK_BEHAVIOR_EXT_POWER app PRIVATE src/behaviors/behavior_ext_power.c)
+target_sources(app PRIVATE src/behaviors/behavior_reset.c)
+target_sources_ifdef(CONFIG_ZMK_EXT_POWER app PRIVATE src/behaviors/behavior_ext_power.c)
 if ((NOT CONFIG_ZMK_SPLIT) OR CONFIG_ZMK_SPLIT_ROLE_CENTRAL)
   target_sources(app PRIVATE src/hid.c)
   target_sources_ifdef(CONFIG_ZMK_MOUSE app PRIVATE src/mouse.c)
@@ -80,8 +80,8 @@ if ((NOT CONFIG_ZMK_SPLIT) OR CONFIG_ZMK_SPLIT_ROLE_CENTRAL)
   endif()
 endif()
 
-target_sources_ifdef(CONFIG_ZMK_BEHAVIOR_RGB_UNDERGLOW app PRIVATE src/behaviors/behavior_rgb_underglow.c)
-target_sources_ifdef(CONFIG_ZMK_BEHAVIOR_BACKLIGHT app PRIVATE src/behaviors/behavior_backlight.c)
+target_sources_ifdef(CONFIG_ZMK_RGB_UNDERGLOW app PRIVATE src/behaviors/behavior_rgb_underglow.c)
+target_sources_ifdef(CONFIG_ZMK_BACKLIGHT app PRIVATE src/behaviors/behavior_backlight.c)
 
 target_sources_ifdef(CONFIG_ZMK_BATTERY_REPORTING app PRIVATE src/events/battery_state_changed.c)
 target_sources_ifdef(CONFIG_ZMK_BATTERY_REPORTING app PRIVATE src/battery.c)
diff --git a/app/Kconfig.behaviors b/app/Kconfig.behaviors
index 9e55f977615..03f26efa783 100644
--- a/app/Kconfig.behaviors
+++ b/app/Kconfig.behaviors
@@ -1,11 +1,6 @@
 # Copyright (c) 2023 The ZMK Contributors
 # SPDX-License-Identifier: MIT
 
-config ZMK_BEHAVIOR_BACKLIGHT
-    bool
-    default y
-    depends on DT_HAS_ZMK_BEHAVIOR_BACKLIGHT_ENABLED && ZMK_BACKLIGHT
-
 config ZMK_BEHAVIOR_BLUETOOTH
     bool
     default y
@@ -16,11 +11,6 @@ config ZMK_BEHAVIOR_CAPS_WORD
     default y
     depends on DT_HAS_ZMK_BEHAVIOR_CAPS_WORD_ENABLED
 
-config ZMK_BEHAVIOR_EXT_POWER
-    bool
-    default y
-    depends on DT_HAS_ZMK_BEHAVIOR_EXT_POWER_ENABLED && ZMK_EXT_POWER
-
 config ZMK_BEHAVIOR_HOLD_TAP
     bool
     default y
@@ -72,16 +62,6 @@ config ZMK_BEHAVIOR_OUTPUTS
     default y
     depends on DT_HAS_ZMK_BEHAVIOR_OUTPUTS_ENABLED
 
-config ZMK_BEHAVIOR_RESET
-    bool
-    default y
-    depends on DT_HAS_ZMK_BEHAVIOR_RESET_ENABLED
-
-config ZMK_BEHAVIOR_RGB_UNDERGLOW
-    bool
-    default y
-    depends on DT_HAS_ZMK_BEHAVIOR_RGB_UNDERGLOW_ENABLED && ZMK_RGB_UNDERGLOW
-
 config ZMK_BEHAVIOR_SENSOR_ROTATE_COMMON
     bool
 
diff --git a/app/dts/behaviors/backlight.dtsi b/app/dts/behaviors/backlight.dtsi
index 54c83ff44c1..355bac79d98 100644
--- a/app/dts/behaviors/backlight.dtsi
+++ b/app/dts/behaviors/backlight.dtsi
@@ -6,8 +6,9 @@
 
  / {
     behaviors {
-        // Behavior can be invoked on peripherals, so name must be <= 8 characters.
-        /omit-if-no-ref/ bl: bcklight {
+        // Behavior can be invoked on peripherals, so name must be <= 8 characters
+        // and cannot be /omit-if-no-ref/
+        bl: bcklight {
             compatible = "zmk,behavior-backlight";
             #binding-cells = <2>;
         };
diff --git a/app/dts/behaviors/ext_power.dtsi b/app/dts/behaviors/ext_power.dtsi
index d28ff966b3d..d6b253de5fc 100644
--- a/app/dts/behaviors/ext_power.dtsi
+++ b/app/dts/behaviors/ext_power.dtsi
@@ -6,8 +6,9 @@
 
 / {
     behaviors {
-        // Behavior can be invoked on peripherals, so name must be <= 8 characters.
-        /omit-if-no-ref/ ext_power: extpower {
+        // Behavior can be invoked on peripherals, so name must be <= 8 characters
+        // and cannot be /omit-if-no-ref/
+        ext_power: extpower {
             compatible = "zmk,behavior-ext-power";
             #binding-cells = <1>;
         };
diff --git a/app/dts/behaviors/reset.dtsi b/app/dts/behaviors/reset.dtsi
index 3f2ee934237..a4882be441d 100644
--- a/app/dts/behaviors/reset.dtsi
+++ b/app/dts/behaviors/reset.dtsi
@@ -8,14 +8,16 @@
 
 / {
     behaviors {
-        // Behavior can be invoked on peripherals, so name must be <= 8 characters.
-        /omit-if-no-ref/ sys_reset: sysreset {
+        // Behavior can be invoked on peripherals, so name must be <= 8 characters
+        // and cannot be /omit-if-no-ref/
+        sys_reset: sysreset {
             compatible = "zmk,behavior-reset";
             #binding-cells = <0>;
         };
 
-        // Behavior can be invoked on peripherals, so name must be <= 8 characters.
-        /omit-if-no-ref/ bootloader: bootload {
+        // Behavior can be invoked on peripherals, so name must be <= 8 characters
+        // and cannot be /omit-if-no-ref/
+        bootloader: bootload {
             compatible = "zmk,behavior-reset";
             type = <RST_UF2>;
             #binding-cells = <0>;
diff --git a/app/dts/behaviors/rgb_underglow.dtsi b/app/dts/behaviors/rgb_underglow.dtsi
index a10df4f8a70..17f93a0d986 100644
--- a/app/dts/behaviors/rgb_underglow.dtsi
+++ b/app/dts/behaviors/rgb_underglow.dtsi
@@ -6,8 +6,9 @@
 
 / {
     behaviors {
-        // Behavior can be invoked on peripherals, so name must be <= 8 characters.
-        /omit-if-no-ref/ rgb_ug: rgb_ug {
+        // Behavior can be invoked on peripherals, so name must be <= 8 characters
+        // and cannot be /omit-if-no-ref/
+        rgb_ug: rgb_ug {
             compatible = "zmk,behavior-rgb-underglow";
             #binding-cells = <2>;
         };