feat(docs): add new recipes section

Recipes document distinct functionality provided by novel use of existing config, features, and behaviors. n.b. All pages are currently only placeholders. All names are tentative.
2026-03-19 20:45:18 -05:00 · 2023-10-04 21:51:54 -07:00
197 changed files with 619 additions and 2510 deletions
--- a/.github/workflows/build-user-config.yml
+++ b/.github/workflows/build-user-config.yml
@@ -97,27 +97,7 @@ jobs:
        run: west build -s zmk/app -b "${{ matrix.board }}" -- -DZMK_CONFIG="${GITHUB_WORKSPACE}/${{ inputs.config_path }}" ${{ env.extra_cmake_args }} ${{ matrix.cmake-args }}

      - name: ${{ env.display_name }} Kconfig file
-        run: |
-          if [ -f build/zephyr/.config ]
-          then
-            grep -v -e "^#" -e "^$" build/zephyr/.config | sort
-          else
-            echo "No Kconfig output"
-          fi
-        if: ${{ !cancelled() }}
-
-      - name: ${{ env.display_name }} Devicetree file
-        run: |
-          if [ -f build/zephyr/zephyr.dts ]
-          then
-            cat build/zephyr/zephyr.dts
-          elif [ -f build/zephyr/zephyr.dts.pre ]
-          then
-            cat -s build/zephyr/zephyr.dts.pre
-          else
-            echo "No Devicetree output"
-          fi
-        if: ${{ !cancelled() }}
+        run: grep -v -e "^#" -e "^$" build/zephyr/.config | sort

      - name: Rename artifacts
        shell: sh -x {0}
--- a/app/Kconfig
+++ b/app/Kconfig
@@ -91,18 +91,10 @@ menu "Output Types"

 config ZMK_USB
    bool "USB"
-    depends on (!ZMK_SPLIT || (ZMK_SPLIT && ZMK_SPLIT_ROLE_CENTRAL))
    select USB
    select USB_DEVICE_STACK
    select USB_DEVICE_HID

-config ZMK_USB_BOOT
-    bool "USB Boot Protocol Support"
-    default y
-    depends on ZMK_USB
-    select USB_HID_BOOT_PROTOCOL
-    select USB_DEVICE_SOF
-
 if ZMK_USB

 config USB_NUMOF_EP_WRITE_RETRIES
@@ -583,3 +575,4 @@ osource "$(ZMK_CONFIG)/boards/shields/*/Kconfig.shield"


 source "Kconfig.zephyr"
+
--- a/app/boards/arm/bdn9/Kconfig.defconfig
+++ b/app/boards/arm/bdn9/Kconfig.defconfig
@@ -11,6 +11,9 @@ config BOARD
 config ZMK_KEYBOARD_NAME
    default "BDN9 Rev2"

+config ZMK_USB
+    default y
+
 config ZMK_RGB_UNDERGLOW
    select SPI
    select WS2812_STRIP
--- a/app/boards/arm/bdn9/bdn9_rev2.dts
+++ b/app/boards/arm/bdn9/bdn9_rev2.dts
@@ -43,7 +43,7 @@
        label = "LEFT_ENCODER";
        a-gpios = <&gpioa 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
        b-gpios = <&gpioa 8 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
-        steps = <80>;
+        resolution = <4>;
        status = "disabled";
    };
    mid_encoder: encoder_mid {
@@ -51,7 +51,7 @@
        label = "MID_ENCODER";
        a-gpios = <&gpioa 9 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
        b-gpios = <&gpioa 10 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
-        steps = <80>;
+        resolution = <4>;
        status = "disabled";
    };
    right_encoder: encoder_right {
@@ -59,7 +59,7 @@
        label = "RIGHT_ENCODER";
        a-gpios = <&gpioa 15 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
        b-gpios = <&gpiob 3 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
-        steps = <80>;
+        resolution = <4>;
        status = "disabled";
    };

@@ -67,7 +67,6 @@
        compatible = "zmk,keymap-sensors";
        status = "disabled";
        sensors = <>;
-        triggers-per-rotation = <20>;
    };
 };

--- a/app/boards/arm/bdn9/bdn9_rev2_defconfig
+++ b/app/boards/arm/bdn9/bdn9_rev2_defconfig
@@ -23,4 +23,3 @@ CONFIG_HEAP_MEM_POOL_SIZE=1024
 # clock configuration
 CONFIG_CLOCK_CONTROL=y

-CONFIG_ZMK_USB=y
--- a/app/boards/arm/bluemicro840/Kconfig.defconfig
+++ b/app/boards/arm/bluemicro840/Kconfig.defconfig
@@ -18,4 +18,10 @@ endif # USB_DEVICE_STACK
 config BT_CTLR
    default BT

+config ZMK_BLE
+    default y
+
+config ZMK_USB
+    default y
+
 endif # BOARD_BLUEMICRO840_V1
--- a/app/boards/arm/bluemicro840/bluemicro840_v1_defconfig
+++ b/app/boards/arm/bluemicro840/bluemicro840_v1_defconfig
@@ -21,6 +21,3 @@ CONFIG_SETTINGS_NVS=y
 CONFIG_FLASH=y
 CONFIG_FLASH_PAGE_LAYOUT=y
 CONFIG_FLASH_MAP=y
-
-CONFIG_ZMK_USB=y
-CONFIG_ZMK_BLE=y
--- a/app/boards/arm/bt60/Kconfig.defconfig
+++ b/app/boards/arm/bt60/Kconfig.defconfig
@@ -19,6 +19,12 @@ endif # USB
 config BT_CTLR
    default BT

+config ZMK_BLE
+    default y
+
+config ZMK_USB
+    default y
+
 config ZMK_KEYBOARD_NAME
    default "BT60"

--- a/app/boards/arm/bt60/bt60.dtsi
+++ b/app/boards/arm/bt60/bt60.dtsi
@@ -22,10 +22,9 @@
        zmk,matrix_transform = &default_transform;
    };

-    sensors: sensors {
+    sensors {
        compatible = "zmk,keymap-sensors";
        sensors = <&left_encoder>;
-        triggers-per-rotation = <20>;
    };


@@ -35,7 +34,7 @@
        label = "LEFT_ENCODER";
        a-gpios = <&gpio1 1 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
        b-gpios = <&gpio1 3 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
-        steps = <80>;
+        resolution = <4>;
        status = "okay";
    };

--- a/app/boards/arm/bt60/bt60_v1_defconfig
+++ b/app/boards/arm/bt60/bt60_v1_defconfig
@@ -23,6 +23,3 @@ CONFIG_SETTINGS_NVS=y
 CONFIG_FLASH=y
 CONFIG_FLASH_PAGE_LAYOUT=y
 CONFIG_FLASH_MAP=y
-
-CONFIG_ZMK_USB=y
-CONFIG_ZMK_BLE=y
--- a/app/boards/arm/bt60/bt60_v1_hs_defconfig
+++ b/app/boards/arm/bt60/bt60_v1_hs_defconfig
@@ -23,6 +23,3 @@ CONFIG_SETTINGS_NVS=y
 CONFIG_FLASH=y
 CONFIG_FLASH_PAGE_LAYOUT=y
 CONFIG_FLASH_MAP=y
-
-CONFIG_ZMK_USB=y
-CONFIG_ZMK_BLE=y
--- a/app/boards/arm/ckp/Kconfig.defconfig
+++ b/app/boards/arm/ckp/Kconfig.defconfig
@@ -25,4 +25,10 @@ endif # USB
 config BT_CTLR
    default BT

+config ZMK_BLE
+    default y
+
+config ZMK_USB
+    default y
+
 endif # BOARD_BT60_V2 || BOARD_BT65_V1 || BOARD_BT75_V1
--- a/app/boards/arm/ckp/bt60_v2_defconfig
+++ b/app/boards/arm/ckp/bt60_v2_defconfig
@@ -36,6 +36,3 @@ CONFIG_WS2812_STRIP=y
 CONFIG_SPI=y

 CONFIG_BT_CTLR_TX_PWR_PLUS_8=y
-
-CONFIG_ZMK_USB=y
-CONFIG_ZMK_BLE=y
--- a/app/boards/arm/ckp/bt65_v1_defconfig
+++ b/app/boards/arm/ckp/bt65_v1_defconfig
@@ -36,6 +36,3 @@ CONFIG_WS2812_STRIP=y
 CONFIG_SPI=y

 CONFIG_BT_CTLR_TX_PWR_PLUS_8=y
-
-CONFIG_ZMK_USB=y
-CONFIG_ZMK_BLE=y
--- a/app/boards/arm/ckp/bt75_v1_defconfig
+++ b/app/boards/arm/ckp/bt75_v1_defconfig
@@ -36,6 +36,3 @@ CONFIG_WS2812_STRIP=y
 CONFIG_SPI=y

 CONFIG_BT_CTLR_TX_PWR_PLUS_8=y
-
-CONFIG_ZMK_USB=y
-CONFIG_ZMK_BLE=y
--- a/app/boards/arm/ckp/ckp.dtsi
+++ b/app/boards/arm/ckp/ckp.dtsi
@@ -26,10 +26,9 @@
        zmk,battery = &vbatt;
    };

-    sensors: sensors {
+    sensors {
        compatible = "zmk,keymap-sensors";
        sensors = <&encoder_1>;
-        triggers-per-rotation = <20>;
    };

    kscan0: kscan_0 {
@@ -77,7 +76,7 @@
        label = "ENCODER_ONE";
        a-gpios = <&gpio0 21 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
        b-gpios = <&gpio0 19 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
-        steps = <80>;
+        resolution = <4>;
        status = "okay";
    };

@@ -86,7 +85,7 @@
        label = "ENCODER_TWO";
        a-gpios = <&gpio0 26 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
        b-gpios = <&gpio0 6 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
-        steps = <80>;
+        resolution = <4>;
        status = "okay";
    };

@@ -95,7 +94,7 @@
        label = "encoder_3";
        a-gpios = <&gpio0 9 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
        b-gpios = <&gpio0 10 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
-        steps = <80>;
+        resolution = <4>;
        status = "okay";
    };

--- a/app/boards/arm/corneish_zen/Kconfig.defconfig
+++ b/app/boards/arm/corneish_zen/Kconfig.defconfig
@@ -25,6 +25,12 @@ config ZMK_SPLIT
 config BT_CTLR
    default BT

+config ZMK_BLE
+    default y
+
+config ZMK_USB
+    default y
+
 if USB

 config USB_NRFX
--- a/app/boards/arm/corneish_zen/corneish_zen_v1_left_defconfig
+++ b/app/boards/arm/corneish_zen/corneish_zen_v1_left_defconfig
@@ -39,9 +39,6 @@ CONFIG_FLASH_MAP=y
 CONFIG_CLOCK_CONTROL_NRF_K32SRC_XTAL=y
 CONFIG_CLOCK_CONTROL_NRF_K32SRC_30PPM=y

-CONFIG_ZMK_USB=y
-CONFIG_ZMK_BLE=y
-
 # enable display drivers
 CONFIG_ZMK_DISPLAY_WORK_QUEUE_DEDICATED=y
 CONFIG_ZMK_DISPLAY_DEDICATED_THREAD_STACK_SIZE=2048
--- a/app/boards/arm/corneish_zen/corneish_zen_v1_right_defconfig
+++ b/app/boards/arm/corneish_zen/corneish_zen_v1_right_defconfig
@@ -39,9 +39,6 @@ CONFIG_FLASH_MAP=y
 CONFIG_CLOCK_CONTROL_NRF_K32SRC_XTAL=y
 CONFIG_CLOCK_CONTROL_NRF_K32SRC_30PPM=y

-CONFIG_ZMK_USB=y
-CONFIG_ZMK_BLE=y
-
 # enable display drivers
 CONFIG_ZMK_DISPLAY_WORK_QUEUE_DEDICATED=y
 CONFIG_ZMK_DISPLAY_DEDICATED_THREAD_STACK_SIZE=2048
--- a/app/boards/arm/corneish_zen/corneish_zen_v2_left_defconfig
+++ b/app/boards/arm/corneish_zen/corneish_zen_v2_left_defconfig
@@ -35,9 +35,6 @@ CONFIG_FLASH_MAP=y
 CONFIG_CLOCK_CONTROL_NRF_K32SRC_XTAL=y
 CONFIG_CLOCK_CONTROL_NRF_K32SRC_30PPM=y

-CONFIG_ZMK_USB=y
-CONFIG_ZMK_BLE=y
-
 # enable display drivers
 CONFIG_ZMK_DISPLAY_WORK_QUEUE_DEDICATED=y
 CONFIG_ZMK_DISPLAY_DEDICATED_THREAD_STACK_SIZE=2048
--- a/app/boards/arm/corneish_zen/corneish_zen_v2_right_defconfig
+++ b/app/boards/arm/corneish_zen/corneish_zen_v2_right_defconfig
@@ -35,9 +35,6 @@ CONFIG_FLASH_MAP=y
 CONFIG_CLOCK_CONTROL_NRF_K32SRC_XTAL=y
 CONFIG_CLOCK_CONTROL_NRF_K32SRC_30PPM=y

-CONFIG_ZMK_USB=y
-CONFIG_ZMK_BLE=y
-
 # enable display drivers
 CONFIG_ZMK_DISPLAY_WORK_QUEUE_DEDICATED=y
 CONFIG_ZMK_DISPLAY_DEDICATED_THREAD_STACK_SIZE=2048
--- a/app/boards/arm/dz60rgb/Kconfig.defconfig
+++ b/app/boards/arm/dz60rgb/Kconfig.defconfig
@@ -8,4 +8,7 @@ if BOARD_DZ60RGB_REV1
 config ZMK_KEYBOARD_NAME
    default "DZ60RGB Rev 1"

+config ZMK_USB
+    default y
+
 endif # BOARD_DZ60RGB_REV1
--- a/app/boards/arm/dz60rgb/dz60rgb_rev1_defconfig
+++ b/app/boards/arm/dz60rgb/dz60rgb_rev1_defconfig
@@ -25,5 +25,3 @@ CONFIG_CLOCK_STM32_PLL_MULTIPLIER=9
 CONFIG_CLOCK_STM32_AHB_PRESCALER=1
 CONFIG_CLOCK_STM32_APB1_PRESCALER=2
 CONFIG_CLOCK_STM32_APB2_PRESCALER=1
-
-CONFIG_ZMK_USB=y
--- a/app/boards/arm/ferris/Kconfig.defconfig
+++ b/app/boards/arm/ferris/Kconfig.defconfig
@@ -11,6 +11,9 @@ config BOARD
 config ZMK_KEYBOARD_NAME
    default "Ferris rev 0.2"

+config ZMK_USB
+    default y
+
 config ZMK_KSCAN_MATRIX_POLLING
    default y

--- a/app/boards/arm/kbdfans_tofu65/Kconfig.defconfig
+++ b/app/boards/arm/kbdfans_tofu65/Kconfig.defconfig
@@ -9,4 +9,7 @@ config ZMK_KEYBOARD_NAME
 config RP2_FLASH_W25Q080
    default y

+config ZMK_USB
+    default y
+
 endif # BOARD_KBDFANS_TOFU65_V2
--- a/app/boards/arm/kbdfans_tofu65/kbdfans_tofu65_v2_defconfig
+++ b/app/boards/arm/kbdfans_tofu65/kbdfans_tofu65_v2_defconfig
@@ -18,5 +18,3 @@ CONFIG_USE_DT_CODE_PARTITION=y

 # Output UF2 by default, native bootloader supports it.
 CONFIG_BUILD_OUTPUT_UF2=y
-
-CONFIG_ZMK_USB=y
--- a/app/boards/arm/mikoto/Kconfig.defconfig
+++ b/app/boards/arm/mikoto/Kconfig.defconfig
@@ -21,6 +21,12 @@ endif # USB
 config BT_CTLR
    default BT

+config ZMK_BLE
+    default y
+
+config ZMK_USB
+    default y
+
 config PINMUX
    default y

--- a/app/boards/arm/mikoto/mikoto_520_defconfig
+++ b/app/boards/arm/mikoto/mikoto_520_defconfig
@@ -21,6 +21,3 @@ CONFIG_SETTINGS_NVS=y
 CONFIG_FLASH=y
 CONFIG_FLASH_PAGE_LAYOUT=y
 CONFIG_FLASH_MAP=y
-
-CONFIG_ZMK_USB=y
-CONFIG_ZMK_BLE=y
--- a/app/boards/arm/nice60/Kconfig.defconfig
+++ b/app/boards/arm/nice60/Kconfig.defconfig
@@ -16,4 +16,10 @@ endif # USB_DEVICE_STACK
 config BT_CTLR
    default BT

+config ZMK_BLE
+    default y
+
+config ZMK_USB
+    default y
+
 endif # BOARD_NICE60
--- a/app/boards/arm/nice60/nice60_defconfig
+++ b/app/boards/arm/nice60/nice60_defconfig
@@ -28,7 +28,3 @@ CONFIG_WS2812_STRIP=y

 CONFIG_ZMK_RGB_UNDERGLOW_HUE_START=160
 CONFIG_ZMK_RGB_UNDERGLOW_EFF_START=3
-
-
-CONFIG_ZMK_USB=y
-CONFIG_ZMK_BLE=y
--- a/app/boards/arm/nice_nano/Kconfig.defconfig
+++ b/app/boards/arm/nice_nano/Kconfig.defconfig
@@ -16,4 +16,10 @@ endif # USB_DEVICE_STACK
 config BT_CTLR
    default BT

+config ZMK_BLE
+    default y
+
+config ZMK_USB
+    default y
+
 endif # BOARD_NICE_NANO || BOARD_NICE_NANO_V2
--- a/app/boards/arm/nice_nano/nice_nano_defconfig
+++ b/app/boards/arm/nice_nano/nice_nano_defconfig
@@ -22,6 +22,3 @@ CONFIG_SETTINGS_NVS=y
 CONFIG_FLASH=y
 CONFIG_FLASH_PAGE_LAYOUT=y
 CONFIG_FLASH_MAP=y
-
-CONFIG_ZMK_USB=y
-CONFIG_ZMK_BLE=y
--- a/app/boards/arm/nice_nano/nice_nano_v2_defconfig
+++ b/app/boards/arm/nice_nano/nice_nano_v2_defconfig
@@ -22,6 +22,3 @@ CONFIG_SETTINGS_NVS=y
 CONFIG_FLASH=y
 CONFIG_FLASH_PAGE_LAYOUT=y
 CONFIG_FLASH_MAP=y
-
-CONFIG_ZMK_BLE=y
-CONFIG_ZMK_USB=y
--- a/app/boards/arm/nrf52840_m2/Kconfig.defconfig
+++ b/app/boards/arm/nrf52840_m2/Kconfig.defconfig
@@ -16,4 +16,10 @@ endif # USB_DEVICE_STACK
 config BT_CTLR
    default BT

+config ZMK_BLE
+    default y
+
+config ZMK_USB
+    default y
+
 endif # BOARD_NRF52840_M2
--- a/app/boards/arm/nrf52840_m2/nrf52840_m2_defconfig
+++ b/app/boards/arm/nrf52840_m2/nrf52840_m2_defconfig
@@ -20,6 +20,3 @@ CONFIG_SETTINGS_NVS=y
 CONFIG_FLASH=y
 CONFIG_FLASH_PAGE_LAYOUT=y
 CONFIG_FLASH_MAP=y
-
-CONFIG_ZMK_USB=y
-CONFIG_ZMK_BLE=y
--- a/app/boards/arm/nrfmicro/Kconfig.defconfig
+++ b/app/boards/arm/nrfmicro/Kconfig.defconfig
@@ -18,6 +18,12 @@ endif # USB_DEVICE_STACK
 config BT_CTLR
    default BT

+config ZMK_BLE
+    default y
+
+config ZMK_USB
+    default y
+
 config PINMUX
    default y

--- a/app/boards/arm/nrfmicro/nrfmicro_11_defconfig
+++ b/app/boards/arm/nrfmicro/nrfmicro_11_defconfig
@@ -23,6 +23,3 @@ CONFIG_FLASH_PAGE_LAYOUT=y
 CONFIG_FLASH_MAP=y
 CONFIG_CLOCK_CONTROL_NRF=y
 CONFIG_CLOCK_CONTROL_NRF_K32SRC_RC=y
-
-CONFIG_ZMK_USB=y
-CONFIG_ZMK_BLE=y
--- a/app/boards/arm/nrfmicro/nrfmicro_11_flipped_defconfig
+++ b/app/boards/arm/nrfmicro/nrfmicro_11_flipped_defconfig
@@ -23,6 +23,3 @@ CONFIG_FLASH_PAGE_LAYOUT=y
 CONFIG_FLASH_MAP=y
 CONFIG_CLOCK_CONTROL_NRF=y
 CONFIG_CLOCK_CONTROL_NRF_K32SRC_RC=y
-
-CONFIG_ZMK_USB=y
-CONFIG_ZMK_BLE=y
--- a/app/boards/arm/nrfmicro/nrfmicro_13_52833_defconfig
+++ b/app/boards/arm/nrfmicro/nrfmicro_13_52833_defconfig
@@ -23,6 +23,3 @@ CONFIG_FLASH_PAGE_LAYOUT=y
 CONFIG_FLASH_MAP=y
 CONFIG_CLOCK_CONTROL_NRF=y
 CONFIG_CLOCK_CONTROL_NRF_K32SRC_RC=y
-
-CONFIG_ZMK_USB=y
-CONFIG_ZMK_BLE=y
--- a/app/boards/arm/nrfmicro/nrfmicro_13_defconfig
+++ b/app/boards/arm/nrfmicro/nrfmicro_13_defconfig
@@ -23,6 +23,3 @@ CONFIG_FLASH_PAGE_LAYOUT=y
 CONFIG_FLASH_MAP=y
 CONFIG_CLOCK_CONTROL_NRF=y
 CONFIG_CLOCK_CONTROL_NRF_K32SRC_RC=y
-
-CONFIG_ZMK_USB=y
-CONFIG_ZMK_BLE=y
--- a/app/boards/arm/pillbug/Kconfig.defconfig
+++ b/app/boards/arm/pillbug/Kconfig.defconfig
@@ -16,4 +16,10 @@ endif # USB_DEVICE_STACK
 config BT_CTLR
    default BT

+config ZMK_BLE
+    default y
+
+config ZMK_USB
+    default y
+
 endif # BOARD_PILLBUG
--- a/app/boards/arm/pillbug/pillbug_defconfig
+++ b/app/boards/arm/pillbug/pillbug_defconfig
@@ -23,6 +23,3 @@ CONFIG_SETTINGS_NVS=y
 CONFIG_FLASH=y
 CONFIG_FLASH_PAGE_LAYOUT=y
 CONFIG_FLASH_MAP=y
-
-CONFIG_ZMK_USB=y
-CONFIG_ZMK_BLE=y
--- a/app/boards/arm/planck/Kconfig.defconfig
+++ b/app/boards/arm/planck/Kconfig.defconfig
@@ -8,6 +8,9 @@ if BOARD_PLANCK_REV6
 config ZMK_KEYBOARD_NAME
    default "Planck V6"

+config ZMK_USB
+    default y
+
 config ZMK_KSCAN_MATRIX_POLLING
    default y

--- a/app/boards/arm/planck/planck_rev6_defconfig
+++ b/app/boards/arm/planck/planck_rev6_defconfig
@@ -15,5 +15,3 @@ CONFIG_GPIO=y

 # clock configuration
 CONFIG_CLOCK_CONTROL=y
-
-CONFIG_ZMK_USB=y
--- a/app/boards/arm/preonic/Kconfig.defconfig
+++ b/app/boards/arm/preonic/Kconfig.defconfig
@@ -8,6 +8,9 @@ if BOARD_PREONIC_REV3
 config ZMK_KEYBOARD_NAME
    default "Preonic V3"

+config ZMK_USB
+    default y
+
 config ZMK_KSCAN_MATRIX_POLLING
    default y

--- a/app/boards/arm/preonic/preonic_rev3_defconfig
+++ b/app/boards/arm/preonic/preonic_rev3_defconfig
@@ -13,5 +13,3 @@ CONFIG_GPIO=y

 # clock configuration
 CONFIG_CLOCK_CONTROL=y
-
-CONFIG_ZMK_USB=y
--- a/app/boards/arm/proton_c/Kconfig.defconfig
+++ b/app/boards/arm/proton_c/Kconfig.defconfig
@@ -8,4 +8,7 @@ if BOARD_QMK_PROTON_C
 config BOARD
    default "proton_c"

+config ZMK_USB
+    default y
+
 endif # BOARD_QMK_PROTON_C
--- a/app/boards/arm/proton_c/proton_c_defconfig
+++ b/app/boards/arm/proton_c/proton_c_defconfig
@@ -17,4 +17,3 @@ CONFIG_GPIO=y
 # clock configuration
 CONFIG_CLOCK_CONTROL=y

-CONFIG_ZMK_USB=y
--- a/app/boards/arm/puchi_ble/Kconfig.defconfig
+++ b/app/boards/arm/puchi_ble/Kconfig.defconfig
@@ -16,6 +16,12 @@ endif # USB_DEVICE_STACK
 config BT_CTLR
    default BT

+config ZMK_BLE
+    default y
+
+config ZMK_USB
+    default y
+
 config PINMUX
    default y

--- a/app/boards/arm/puchi_ble/puchi_ble_v1_defconfig
+++ b/app/boards/arm/puchi_ble/puchi_ble_v1_defconfig
@@ -25,6 +25,3 @@ CONFIG_FLASH_PAGE_LAYOUT=y
 CONFIG_FLASH_MAP=y
 CONFIG_CLOCK_CONTROL_NRF=y
 CONFIG_CLOCK_CONTROL_NRF_K32SRC_RC=y
-
-CONFIG_ZMK_USB=y
-CONFIG_ZMK_BLE=y
--- a/app/boards/arm/s40nc/Kconfig.defconfig
+++ b/app/boards/arm/s40nc/Kconfig.defconfig
@@ -19,4 +19,10 @@ endif # USB
 config BT_CTLR
    default BT

+config ZMK_BLE
+    default y
+
+config ZMK_USB
+    default y
+
 endif # BOARD_S40NC
--- a/app/boards/arm/s40nc/s40nc_defconfig
+++ b/app/boards/arm/s40nc/s40nc_defconfig
@@ -20,6 +20,3 @@ CONFIG_SETTINGS_NVS=y
 CONFIG_FLASH=y
 CONFIG_FLASH_PAGE_LAYOUT=y
 CONFIG_FLASH_MAP=y
-
-CONFIG_ZMK_USB=y
-CONFIG_ZMK_BLE=y
--- a/app/boards/shields/knob_goblin/knob_goblin.overlay
+++ b/app/boards/shields/knob_goblin/knob_goblin.overlay
@@ -39,7 +39,7 @@
        label = "TOP_ENCODER";
        a-gpios = <&pro_micro 19 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>;
        b-gpios = <&pro_micro 18 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>;
-        steps = <80>;
+        resolution = <4>;
        status = "okay";
    };

@@ -48,14 +48,13 @@
        label = "BOTTOM_ENCODER";
        a-gpios = <&pro_micro 20 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>;
        b-gpios = <&pro_micro 21 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>;
-        steps = <80>;
+        resolution = <4>;
        status = "okay";
    };

-    sensors: sensors {
+    sensors {
        compatible = "zmk,keymap-sensors";
        sensors = <&top_encoder &bottom_encoder>;
-        triggers-per-rotation = <20>;
    };

 };
--- a/app/boards/shields/kyria/kyria_common.dtsi
+++ b/app/boards/shields/kyria/kyria_common.dtsi
@@ -23,21 +23,20 @@
    left_encoder: encoder_left {
        compatible = "alps,ec11";
        label = "LEFT_ENCODER";
-        steps = <80>;
+        resolution = <4>;
        status = "disabled";
    };

    right_encoder: encoder_right {
        compatible = "alps,ec11";
        label = "RIGHT_ENCODER";
-        steps = <80>;
+        resolution = <4>;
        status = "disabled";
    };

-    sensors: sensors {
+    sensors {
        compatible = "zmk,keymap-sensors";
        sensors = <&left_encoder &right_encoder>;
-        triggers-per-rotation = <20>;
    };

    // TODO: RGB node(s)
--- a/app/boards/shields/lily58/lily58.dtsi
+++ b/app/boards/shields/lily58/lily58.dtsi
@@ -51,13 +51,12 @@ RC(3,0) RC(3,1) RC(3,2) RC(3,3) RC(3,4) RC(3,5) RC(4,5) RC(4,6) RC(3,6) RC(3,7)
        label = "LEFT_ENCODER";
        a-gpios = <&pro_micro 21 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
        b-gpios = <&pro_micro 20 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
-        steps = <80>;
+        resolution = <4>;
    };

-    sensors: sensors {
+    sensors {
        compatible = "zmk,keymap-sensors";
        sensors = <&left_encoder>;
-        triggers-per-rotation = <20>;
    };
 };

--- a/app/boards/shields/lotus58/lotus58.dtsi
+++ b/app/boards/shields/lotus58/lotus58.dtsi
@@ -50,7 +50,7 @@ RC(3,0) RC(3,1) RC(3,2) RC(3,3) RC(3,4) RC(3,5) RC(4,5)  RC(4,6)  RC(3,6) RC(3,7
        label = "LEFT_ENCODER";
        a-gpios = <&pro_micro 21 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
        b-gpios = <&pro_micro 20 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
-        steps = <80>;
+        resolution = <4>;
        status = "disabled";
    };

@@ -59,14 +59,13 @@ RC(3,0) RC(3,1) RC(3,2) RC(3,3) RC(3,4) RC(3,5) RC(4,5)  RC(4,6)  RC(3,6) RC(3,7
        label = "RIGHT_ENCODER";
        a-gpios = <&pro_micro 20 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
        b-gpios = <&pro_micro 21 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
-        steps = <80>;
+        resolution = <4>;
        status = "disabled";
    };

-    sensors: sensors {
+    sensors {
        compatible = "zmk,keymap-sensors";
        sensors = <&left_encoder &right_encoder>;
-        triggers-per-rotation = <20>;
    };
 };

--- a/app/boards/shields/microdox/Kconfig.defconfig
+++ b/app/boards/shields/microdox/Kconfig.defconfig
@@ -1,7 +1,7 @@
 # Copyright (c) 2020 The ZMK Contributors
 # SPDX-License-Identifier: MIT

-if SHIELD_MICRODOX_LEFT || SHIELD_MICRODOX_V2_LEFT
+if SHIELD_MICRODOX_LEFT

 config ZMK_KEYBOARD_NAME
    default "Microdox"
@@ -11,7 +11,7 @@ config ZMK_SPLIT_ROLE_CENTRAL

 endif

-if SHIELD_MICRODOX_LEFT || SHIELD_MICRODOX_RIGHT || SHIELD_MICRODOX_V2_LEFT || SHIELD_MICRODOX_V2_RIGHT
+if SHIELD_MICRODOX_LEFT || SHIELD_MICRODOX_RIGHT

 config ZMK_SPLIT
    default y
--- a/app/boards/shields/microdox/Kconfig.shield
+++ b/app/boards/shields/microdox/Kconfig.shield
@@ -6,9 +6,3 @@ config SHIELD_MICRODOX_LEFT

 config SHIELD_MICRODOX_RIGHT
    def_bool $(shields_list_contains,microdox_right)
-
-config SHIELD_MICRODOX_V2_LEFT
-    def_bool $(shields_list_contains,microdox_v2_left)
-
-config SHIELD_MICRODOX_V2_RIGHT
-    def_bool $(shields_list_contains,microdox_v2_right)
--- a/app/boards/shields/microdox/README.md
+++ b/app/boards/shields/microdox/README.md
@@ -1,8 +0,0 @@
-# Microdox
-
-Microdox is a 36 key split keyboard by Boardsource.
-
-Two variants are defined for this shield – V1 and V2. The layout is exactly the same between the
-two. Per [help documentation](https://www.boardsource.xyz/help/6129be4a9c85c6050be190d2), if you
-purchased your PCB before April 2022, use `microdox_left`/`microdox_right`. Otherwise, use
-`microdox_v2_left`/`microdox_v2_right`.
--- a/app/boards/shields/microdox/microdox.dtsi
+++ b/app/boards/shields/microdox/microdox.dtsi
@@ -4,12 +4,35 @@
 * SPDX-License-Identifier: MIT
 */

-#include "microdox_common.dtsi"
+#include <dt-bindings/zmk/matrix_transform.h>

 / {
+    chosen {
+        zephyr,display = &oled;
+        zmk,kscan = &kscan0;
+        zmk,matrix_transform = &default_transform;
+    };
+
+    default_transform: keymap_transform_0 {
+        compatible = "zmk,matrix-transform";
+        columns = <10>;
+        rows = <4>;
+// | SW1  | SW2  | SW3  | SW4  | SW5  |   | SW5  | SW4  | SW3  | SW2  | SW1  |
+// | SW6  | SW7  | SW8  | SW9  | SW10 |   | SW10 | SW9  | SW8  | SW7  | SW6  |
+// | SW11 | SW12 | SW13 | SW14 | SW15 |   | SW15 | SW14 | SW13 | SW12 | SW11 |
+//               | SW16 | SW17 | SW18 |   | SW18 | SW17 | SW16 |
+        map = <
+RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4)  RC(0,5) RC(0,6) RC(0,7) RC(0,8) RC(0,9)
+RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4)  RC(1,5) RC(1,6) RC(1,7) RC(1,8) RC(1,9)
+RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4)  RC(2,5) RC(2,6) RC(2,7) RC(2,8) RC(2,9)
+                RC(3,2) RC(3,3) RC(3,4)  RC(3,5) RC(3,6) RC(3,7)
+        >;
+    };
+
    kscan0: kscan {
        compatible = "zmk,kscan-gpio-matrix";
        label = "KSCAN";
+
        diode-direction = "col2row";
        row-gpios
            = <&pro_micro 16 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
@@ -17,5 +40,26 @@
            , <&pro_micro 8  (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
            , <&pro_micro 9  (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
            ;
+
+    };
+
+    // TODO: per-key RGB node(s)?
+};
+
+&pro_micro_i2c {
+    status = "okay";
+
+    oled: ssd1306@3c {
+        compatible = "solomon,ssd1306fb";
+        reg = <0x3c>;
+        label = "DISPLAY";
+        width = <128>;
+        height = <32>;
+        segment-offset = <0>;
+        page-offset = <0>;
+        display-offset = <0>;
+        multiplex-ratio = <31>;
+        com-sequential;
+        prechargep = <0x22>;
    };
 };
--- a/app/boards/shields/microdox/microdox_common.dtsi
+++ b/app/boards/shields/microdox/microdox_common.dtsi
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 2023 The ZMK Contributors
- *
- * SPDX-License-Identifier: MIT
- */
-
-#include <dt-bindings/zmk/matrix_transform.h>
-
-/ {
-    chosen {
-        zephyr,display = &oled;
-        zmk,kscan = &kscan0;
-        zmk,matrix_transform = &default_transform;
-
-    };
-
-    default_transform: keymap_transform_0 {
-        compatible = "zmk,matrix-transform";
-        columns = <10>;
-        rows = <4>;
-// | SW1  | SW2  | SW3  | SW4  | SW5  |   | SW5  | SW4  | SW3  | SW2  | SW1  |
-// | SW6  | SW7  | SW8  | SW9  | SW10 |   | SW10 | SW9  | SW8  | SW7  | SW6  |
-// | SW11 | SW12 | SW13 | SW14 | SW15 |   | SW15 | SW14 | SW13 | SW12 | SW11 |
-//               | SW16 | SW17 | SW18 |   | SW18 | SW17 | SW16 |
-        map = <
-RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4)  RC(0,5) RC(0,6) RC(0,7) RC(0,8) RC(0,9)
-RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4)  RC(1,5) RC(1,6) RC(1,7) RC(1,8) RC(1,9)
-RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4)  RC(2,5) RC(2,6) RC(2,7) RC(2,8) RC(2,9)
-                RC(3,2) RC(3,3) RC(3,4)  RC(3,5) RC(3,6) RC(3,7)
-        >;
-    };
-
-    // TODO: per-key RGB node(s)?
-};
-
-&pro_micro_i2c {
-    status = "okay";
-    oled: ssd1306@3c {
-        compatible = "solomon,ssd1306fb";
-        reg = <0x3c>;
-        label = "DISPLAY";
-        width = <128>;
-        height = <32>;
-        segment-offset = <0>;
-        page-offset = <0>;
-        display-offset = <0>;
-        multiplex-ratio = <31>;
-        com-sequential;
-        prechargep = <0x22>;
-    };
-};
--- a/app/boards/shields/microdox/microdox_v2.conf
+++ b/app/boards/shields/microdox/microdox_v2.conf
@@ -1,6 +0,0 @@
-# Uncomment the following lines to enable the Microdox RGB Underglow
-# CONFIG_ZMK_RGB_UNDERGLOW=y
-# CONFIG_WS2812_STRIP=y
-
-# Uncomment the following line to enable the Microdox OLED Display
-# CONFIG_ZMK_DISPLAY=y
--- a/app/boards/shields/microdox/microdox_v2.dtsi
+++ b/app/boards/shields/microdox/microdox_v2.dtsi
@@ -1,15 +0,0 @@
-/*
- * Copyright (c) 2023 The ZMK Contributors
- *
- * SPDX-License-Identifier: MIT
- */
-
-#include "microdox_common.dtsi"
-
-/ {
-    kscan0: kscan {
-        compatible = "zmk,kscan-gpio-matrix";
-        label = "KSCAN";
-        diode-direction = "col2row";
-    };
-};
--- a/app/boards/shields/microdox/microdox_v2.zmk.yml
+++ b/app/boards/shields/microdox/microdox_v2.zmk.yml
@@ -1,13 +0,0 @@
-file_format: "1"
-id: microdox_v2
-name: Microdox V2
-type: shield
-url: https://boardsource.xyz/store/5f2e7e4a2902de7151494f92
-requires: [pro_micro]
-exposes: [i2c_oled]
-features:
-  - keys
-  - display
-siblings:
-  - microdox_v2_left
-  - microdox_v2_right
--- a/app/boards/shields/microdox/microdox_v2_left.conf
+++ b/app/boards/shields/microdox/microdox_v2_left.conf
--- a/app/boards/shields/microdox/microdox_v2_left.overlay
+++ b/app/boards/shields/microdox/microdox_v2_left.overlay
@@ -1,23 +0,0 @@
-/*
- * Copyright (c) 2023 The ZMK Contributors
- *
- * SPDX-License-Identifier: MIT
- */
-
-#include "microdox_v2.dtsi"
-
-&kscan0 {
-    col-gpios
-        = <&pro_micro 4  GPIO_ACTIVE_HIGH>
-        , <&pro_micro 6  GPIO_ACTIVE_HIGH>
-        , <&pro_micro 14 GPIO_ACTIVE_HIGH>
-        , <&pro_micro 18 GPIO_ACTIVE_HIGH>
-        , <&pro_micro 19 GPIO_ACTIVE_HIGH>
-        ;
-    row-gpios
-        = <&pro_micro 21 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-        , <&pro_micro 0  (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-        , <&pro_micro 5  (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-        , <&pro_micro 15 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-        ;
-};
--- a/app/boards/shields/microdox/microdox_v2_right.conf
+++ b/app/boards/shields/microdox/microdox_v2_right.conf
--- a/app/boards/shields/microdox/microdox_v2_right.overlay
+++ b/app/boards/shields/microdox/microdox_v2_right.overlay
@@ -1,32 +0,0 @@
-/*
- * Copyright (c) 2023 The ZMK Contributors
- *
- * SPDX-License-Identifier: MIT
- */
-
-#include "microdox.dtsi"
-
-&default_transform {
-    col-offset = <5>;
-};
-
-&oled {
-    segment-remap;
-    com-invdir;
-};
-
-&kscan0 {
-    col-gpios
-        = <&pro_micro 14 GPIO_ACTIVE_HIGH>
-        , <&pro_micro 5  GPIO_ACTIVE_HIGH>
-        , <&pro_micro 6  GPIO_ACTIVE_HIGH>
-        , <&pro_micro 15 GPIO_ACTIVE_HIGH>
-        , <&pro_micro 21 GPIO_ACTIVE_HIGH>
-        ;
-    row-gpios
-        = <&pro_micro 20 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-        , <&pro_micro 18 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-        , <&pro_micro 19 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-        , <&pro_micro 7  (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-        ;
-};
--- a/app/boards/shields/murphpad/murphpad.keymap
+++ b/app/boards/shields/murphpad/murphpad.keymap
@@ -48,7 +48,6 @@
    sensors {
        compatible = "zmk,keymap-sensors";
        sensors = <&encoder_1 &encoder_2>;
-        triggers-per-rotation = <20>;
    };


--- a/app/boards/shields/murphpad/murphpad.overlay
+++ b/app/boards/shields/murphpad/murphpad.overlay
@@ -39,7 +39,7 @@
        label = "Encoder 1";
        a-gpios = <&pro_micro 8 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>;
        b-gpios = <&pro_micro 7 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>;
-        steps = <80>;
+        resolution = <4>;
        status = "disabled";
    };

@@ -48,7 +48,7 @@
        label = "Encoder 2";
        a-gpios = <&pro_micro 1 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>;
        b-gpios = <&pro_micro 0 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>;
-        steps = <80>;
+        resolution = <4>;
        status = "disabled";
    };

--- a/app/boards/shields/nibble/Kconfig.defconfig
+++ b/app/boards/shields/nibble/Kconfig.defconfig
@@ -6,6 +6,10 @@ if SHIELD_NIBBLE
 config ZMK_KEYBOARD_NAME
    default "NIBBLE"

+config ZMK_USB
+    default y
+
+
 if ZMK_DISPLAY

 config I2C
--- a/app/boards/shields/nibble/nibble.keymap
+++ b/app/boards/shields/nibble/nibble.keymap
@@ -12,7 +12,6 @@
    sensors {
        compatible = "zmk,keymap-sensors";
        sensors = <&encoder_1>;
-        triggers-per-rotation = <20>;
    };

    keymap {
--- a/app/boards/shields/nibble/nibble.overlay
+++ b/app/boards/shields/nibble/nibble.overlay
@@ -18,7 +18,7 @@
        label = "Encoder 1";
        a-gpios = <&pro_micro 9 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>;
        b-gpios = <&pro_micro 8 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>;
-        steps = <80>;
+        resolution = <4>;
        status = "okay";
    };

--- a/app/boards/shields/nice_view/widgets/status.c
+++ b/app/boards/shields/nice_view/widgets/status.c
@@ -30,7 +30,6 @@ static sys_slist_t widgets = SYS_SLIST_STATIC_INIT(&widgets);

 struct output_status_state {
    struct zmk_endpoint_instance selected_endpoint;
-    int active_profile_index;
    bool active_profile_connected;
    bool active_profile_bonded;
 };
@@ -147,7 +146,7 @@ static void draw_middle(lv_obj_t *widget, lv_color_t cbuf[], const struct status
    };

    for (int i = 0; i < 5; i++) {
-        bool selected = i == state->active_profile_index;
+        bool selected = state->selected_endpoint.ble.profile_index == i;

        lv_canvas_draw_arc(canvas, circle_offsets[i][0], circle_offsets[i][1], 13, 0, 359,
                           &arc_dsc);
@@ -229,7 +228,6 @@ ZMK_SUBSCRIPTION(widget_battery_status, zmk_usb_conn_state_changed);
 static void set_output_status(struct zmk_widget_status *widget,
                              const struct output_status_state *state) {
    widget->state.selected_endpoint = state->selected_endpoint;
-    widget->state.active_profile_index = state->active_profile_index;
    widget->state.active_profile_connected = state->active_profile_connected;
    widget->state.active_profile_bonded = state->active_profile_bonded;

@@ -245,7 +243,6 @@ static void output_status_update_cb(struct output_status_state state) {
 static struct output_status_state output_status_get_state(const zmk_event_t *_eh) {
    return (struct output_status_state){
        .selected_endpoint = zmk_endpoints_selected(),
-        .active_profile_index = zmk_ble_active_profile_index(),
        .active_profile_connected = zmk_ble_active_profile_is_connected(),
        .active_profile_bonded = !zmk_ble_active_profile_is_open(),
    };
--- a/app/boards/shields/nice_view/widgets/util.h
+++ b/app/boards/shields/nice_view/widgets/util.h
@@ -20,7 +20,6 @@ struct status_state {
    bool charging;
 #if !IS_ENABLED(CONFIG_ZMK_SPLIT) || IS_ENABLED(CONFIG_ZMK_SPLIT_ROLE_CENTRAL)
    struct zmk_endpoint_instance selected_endpoint;
-    int active_profile_index;
    bool active_profile_connected;
    bool active_profile_bonded;
    uint8_t layer_index;
--- a/app/boards/shields/reviung34/Kconfig.defconfig
+++ b/app/boards/shields/reviung34/Kconfig.defconfig
@@ -1,9 +0,0 @@
-# Copyright (c) 2023 The ZMK Contributors
-# SPDX-License-Identifier: MIT
-
-if SHIELD_REVIUNG34
-
-config ZMK_KEYBOARD_NAME
-    default "REVIUNG34"
-
-endif
--- a/app/boards/shields/reviung34/Kconfig.shield
+++ b/app/boards/shields/reviung34/Kconfig.shield
@@ -1,5 +0,0 @@
-# Copyright (c) 2023 The ZMK Contributors
-# SPDX-License-Identifier: MIT
-
-config SHIELD_REVIUNG34
-    def_bool $(shields_list_contains,reviung34)
--- a/app/boards/shields/reviung34/README.md
+++ b/app/boards/shields/reviung34/README.md
@@ -1,13 +0,0 @@
-# REVIUNG34
-
-REVIUNG34 is a 33-34 key unibody split keyboard by [gtips](https://github.com/gtips). An in-stock version can be found at [Little Keyboards](https://www.littlekeyboards.com/products/reviung34-analyst-keyboard-kit).
-
-By default, the 2x1u layout is used. To use to the 1x2u layout, add the following to your keymap:
-
-```
-/ {
-    chosen {
-        zmk,matrix_transform = &single_2u_transform;
-    };
-};
-```
--- a/app/boards/shields/reviung34/boards/nice_nano_v2.overlay
+++ b/app/boards/shields/reviung34/boards/nice_nano_v2.overlay
@@ -1,48 +0,0 @@
-#include <dt-bindings/led/led.h>
-
-&pinctrl {
-    spi3_default: spi3_default {
-        group1 {
-            psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
-        };
-    };
-
-    spi3_sleep: spi3_sleep {
-        group1 {
-            psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
-            low-power-enable;
-        };
-    };
-};
-
-&spi3 {
-    compatible = "nordic,nrf-spim";
-    status = "okay";
-
-    pinctrl-0 = <&spi3_default>;
-    pinctrl-1 = <&spi3_sleep>;
-    pinctrl-names = "default", "sleep";
-
-    led_strip: ws2812@0 {
-        compatible = "worldsemi,ws2812-spi";
-        label = "WS2812";
-
-        /* SPI */
-        reg = <0>; /* ignored, but necessary for SPI bindings */
-        spi-max-frequency = <4000000>;
-
-        /* WS2812 */
-        chain-length = <9>; /* number of LEDs */
-        spi-one-frame = <0x70>;
-        spi-zero-frame = <0x40>;
-        color-mapping = <LED_COLOR_ID_GREEN
-                         LED_COLOR_ID_RED
-                         LED_COLOR_ID_BLUE>;
-    };
-};
-
-/ {
-    chosen {
-        zmk,underglow = &led_strip;
-    };
-};
--- a/app/boards/shields/reviung34/reviung34.conf
+++ b/app/boards/shields/reviung34/reviung34.conf
@@ -1,3 +0,0 @@
-# Uncomment the following lines to enable RGB underglow
-# CONFIG_ZMK_RGB_UNDERGLOW=y
-# CONFIG_WS2812_STRIP=y
--- a/app/boards/shields/reviung34/reviung34.keymap
+++ b/app/boards/shields/reviung34/reviung34.keymap
@@ -1,77 +0,0 @@
-/*
- * Copyright (c) 2023 The ZMK Contributors
- *
- * SPDX-License-Identifier: MIT
- */
-
-#include <behaviors.dtsi>
-#include <dt-bindings/zmk/bt.h>
-#include <dt-bindings/zmk/keys.h>
-#include <dt-bindings/zmk/rgb.h>
-
-/ {
-    chosen {
-        // 34 keys.
-        zmk,matrix_transform = &dual_1u_transform;
-
-        // 33 keys. Center two thumb keys replaced by a single 2u key. Remember to adjust your
-        // keymap accordingly!
-        // zmk,matrix_transform = &single_2u_transform;
-    };
-};
-
-/ {
-    keymap {
-        compatible = "zmk,keymap";
-
-        base {
-            label = "Base";
-            bindings = <
-&kp Q       &kp W       &kp E      &kp R &kp T    &kp Y      &kp U       &kp I          &kp O         &kp P
-&kp A       &kp S       &kp D      &kp F &kp G    &kp H      &kp J       &kp K          &kp L         &kp SEMI
-&mt LSHFT Z &mt LCTRL X &mt LALT C &kp V &kp B    &kp N      &kp M       &mt RALT COMMA &mt RCTRL DOT &mt RSHFT SLASH
-                                   &kp LGUI       &lt 1 BSPC &lt 2 SPACE &mo 3
-            >;
-        };
-
-        lower {
-            label = "Lower";
-            bindings = <
-&kp EXCL &kp AT    &kp HASH &kp DLLR &kp PRCNT &kp CARET &kp AMPS  &kp ASTRK &kp LPAR &kp RPAR
-&trans   &kp TILDE &kp DQT  &kp PIPE &trans    &trans    &kp UNDER &kp PLUS  &kp LBRC &kp RBRC
-&trans   &trans    &trans   &trans   &trans    &trans    &trans    &trans    &trans   &trans
-                            &trans   &trans    &mo 4    &trans
-            >;
-        };
-
-        upper {
-            label = "Upper";
-            bindings = <
-&kp N1 &kp N2    &kp N3  &kp N4   &kp N5 &kp N6 &kp N7    &kp N8    &kp N9   &kp N0
-&trans &kp GRAVE &kp SQT &kp BSLH &trans &trans &kp MINUS &kp EQUAL &kp LBKT &kp RBKT
-&trans &trans    &trans  &trans   &trans &trans &trans    &trans    &trans   &trans
-                         &trans   &mo 4  &trans  &trans
-            >;
-        };
-
-        function {
-            label = "Function";
-            bindings = <
-&kp TAB &trans       &kp C_VOL_UP &trans       &trans    &trans &trans   &trans   &trans &kp ENTER
-&kp ESC &kp C_BRI_DN &kp C_VOL_DN &kp C_BRI_UP &trans    &trans &kp LEFT &kp DOWN &kp UP &kp RIGHT
-&trans  &trans       &trans       &trans       &trans    &trans &trans   &trans   &trans &trans
-                                  &trans       &kp C_PWR &trans &trans
-            >;
-        };
-
-        meta {
-            label = "Meta";
-            bindings = <
-&rgb_ug RGB_HUI &rgb_ug RGB_SAI &rgb_ug RGB_BRI &rgb_ug RGB_SPI &rgb_ug RGB_EFF &none        &none        &none        &none        &none
-&rgb_ug RGB_HUD &rgb_ug RGB_SAD &rgb_ug RGB_BRD &rgb_ug RGB_SPD &rgb_ug RGB_EFR &bt BT_SEL 0 &bt BT_SEL 1 &bt BT_SEL 2 &bt BT_SEL 3 &bt BT_SEL 4
-&none           &none           &rgb_ug RGB_TOG &none           &none           &none        &none        &bt BT_CLR   &none        &none
-                                &none           &trans          &trans          &none
-            >;
-        };
-    };
-};
--- a/app/boards/shields/reviung34/reviung34.overlay
+++ b/app/boards/shields/reviung34/reviung34.overlay
@@ -1,63 +0,0 @@
-/*
- * Copyright (c) 2023 The ZMK Contributors
- *
- * SPDX-License-Identifier: MIT
- */
-
-#include <dt-bindings/zmk/matrix_transform.h>
-
-/ {
-    chosen {
-        zmk,kscan = &kscan0;
-        zmk,matrix_transform = &dual_1u_transform;
-    };
-
-    dual_1u_transform: keymap_transform_0 {
-        compatible = "zmk,matrix-transform";
-        columns = <9>;
-        rows = <4>;
-        map = <
-RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5) RC(0,6) RC(0,7) RC(0,8) RC(3,5)
-RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5) RC(1,6) RC(1,7) RC(1,8) RC(3,6)
-RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(2,6) RC(2,7) RC(2,8) RC(3,7)
-                        RC(3,2) RC(3,3) RC(3,4) RC(3,8)
-        >;
-    };
-
-    single_2u_transform: keymap_transform_1 {
-        compatible = "zmk,matrix-transform";
-        columns = <9>;
-        rows = <4>;
-        map = <
-RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5) RC(0,6) RC(0,7) RC(0,8) RC(3,5)
-RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5) RC(1,6) RC(1,7) RC(1,8) RC(3,6)
-RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(2,6) RC(2,7) RC(2,8) RC(3,7)
-                            RC(3,2) RC(3,4) RC(3,8)
-        >;
-    };
-
-    kscan0: kscan_0 {
-        compatible = "zmk,kscan-gpio-matrix";
-        label = "KSCAN";
-        diode-direction = "col2row";
-
-        col-gpios
-            = <&pro_micro 4 GPIO_ACTIVE_HIGH>
-            , <&pro_micro 5 GPIO_ACTIVE_HIGH>
-            , <&pro_micro 6 GPIO_ACTIVE_HIGH>
-            , <&pro_micro 7 GPIO_ACTIVE_HIGH>
-            , <&pro_micro 8 GPIO_ACTIVE_HIGH>
-            , <&pro_micro 15 GPIO_ACTIVE_HIGH>
-            , <&pro_micro 14 GPIO_ACTIVE_HIGH>
-            , <&pro_micro 16 GPIO_ACTIVE_HIGH>
-            , <&pro_micro 10 GPIO_ACTIVE_HIGH>
-            ;
-
-        row-gpios
-            = <&pro_micro 21 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-            , <&pro_micro 20 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-            , <&pro_micro 19 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-            , <&pro_micro 18 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-            ;
-    };
-};
--- a/app/boards/shields/reviung34/reviung34.zmk.yml
+++ b/app/boards/shields/reviung34/reviung34.zmk.yml
@@ -1,9 +0,0 @@
-file_format: "1"
-id: reviung34
-name: REVIUNG34
-type: shield
-url: https://github.com/gtips/reviung/tree/master/reviung34
-requires: [pro_micro]
-features:
-  - keys
-  - underglow
--- a/app/boards/shields/reviung5/reviung5.overlay
+++ b/app/boards/shields/reviung5/reviung5.overlay
@@ -43,13 +43,12 @@
        label = "encoder";
        a-gpios = <&pro_micro 3 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
        b-gpios = <&pro_micro 2 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
-        steps = <80>;
+        resolution = <4>;
        status = "okay";
    };

-    sensors: sensors {
+    sensors {
        compatible = "zmk,keymap-sensors";
        sensors = <&encoder>;
-        triggers-per-rotation = <20>;
    };
 };
--- a/app/boards/shields/reviung53/Kconfig.defconfig
+++ b/app/boards/shields/reviung53/Kconfig.defconfig
@@ -1,9 +0,0 @@
-# Copyright (c) 2023 The ZMK Contributors
-# SPDX-License-Identifier: MIT
-
-if SHIELD_REVIUNG53
-
-config ZMK_KEYBOARD_NAME
-    default "Reviung53"
-
-endif
--- a/app/boards/shields/reviung53/Kconfig.shield
+++ b/app/boards/shields/reviung53/Kconfig.shield
@@ -1,5 +0,0 @@
-# Copyright (c) 2023 The ZMK Contributors
-# SPDX-License-Identifier: MIT
-
-config SHIELD_REVIUNG53
-    def_bool $(shields_list_contains,reviung53)
--- a/app/boards/shields/reviung53/boards/nice_nano.overlay
+++ b/app/boards/shields/reviung53/boards/nice_nano.overlay
@@ -1,47 +0,0 @@
-#include <dt-bindings/led/led.h>
-
-&pinctrl {
-    spi3_default: spi3_default {
-        group1 {
-            psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
-        };
-    };
-
-    spi3_sleep: spi3_sleep {
-        group1 {
-            psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
-            low-power-enable;
-        };
-    };
-};
-
-&spi3 {
-    compatible = "nordic,nrf-spim";
-    status = "okay";
-
-    pinctrl-0 = <&spi3_default>;
-    pinctrl-1 = <&spi3_sleep>;
-    pinctrl-names = "default", "sleep";
-
-    led_strip: ws2812@0 {
-        compatible = "worldsemi,ws2812-spi";
-        label = "WS2812";
-
-        /* SPI */
-        reg = <0>; /* ignored, but necessary for SPI bindings */
-        spi-max-frequency = <4000000>;
-
-        /* WS2812 */
-        chain-length = <10>;
-        spi-one-frame = <0x70>;
-        spi-zero-frame = <0x40>;
-
-        color-mapping = <LED_COLOR_ID_GREEN LED_COLOR_ID_RED LED_COLOR_ID_BLUE>;
-    };
-};
-
-/ {
-    chosen {
-        zmk,underglow = &led_strip;
-    };
-};
--- a/app/boards/shields/reviung53/boards/nice_nano_v2.overlay
+++ b/app/boards/shields/reviung53/boards/nice_nano_v2.overlay
@@ -1,47 +0,0 @@
-#include <dt-bindings/led/led.h>
-
-&pinctrl {
-    spi3_default: spi3_default {
-        group1 {
-            psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
-        };
-    };
-
-    spi3_sleep: spi3_sleep {
-        group1 {
-            psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
-            low-power-enable;
-        };
-    };
-};
-
-&spi3 {
-    compatible = "nordic,nrf-spim";
-    status = "okay";
-
-    pinctrl-0 = <&spi3_default>;
-    pinctrl-1 = <&spi3_sleep>;
-    pinctrl-names = "default", "sleep";
-
-    led_strip: ws2812@0 {
-        compatible = "worldsemi,ws2812-spi";
-        label = "WS2812";
-
-        /* SPI */
-        reg = <0>; /* ignored, but necessary for SPI bindings */
-        spi-max-frequency = <4000000>;
-
-        /* WS2812 */
-        chain-length = <10>;
-        spi-one-frame = <0x70>;
-        spi-zero-frame = <0x40>;
-
-        color-mapping = <LED_COLOR_ID_GREEN LED_COLOR_ID_RED LED_COLOR_ID_BLUE>;
-    };
-};
-
-/ {
-    chosen {
-        zmk,underglow = &led_strip;
-    };
-};
--- a/app/boards/shields/reviung53/reviung53.conf
+++ b/app/boards/shields/reviung53/reviung53.conf
@@ -1,3 +0,0 @@
-# Uncomment the following lines to enable RGB underglow
-# CONFIG_ZMK_RGB_UNDERGLOW=y
-# CONFIG_WS2812_STRIP=y
--- a/app/boards/shields/reviung53/reviung53.keymap
+++ b/app/boards/shields/reviung53/reviung53.keymap
@@ -1,109 +0,0 @@
-/*
- * Copyright (c) 2023 The ZMK Contributors
- *
- * SPDX-License-Identifier: MIT
- */
-
-#include <behaviors.dtsi>
-#include <dt-bindings/zmk/keys.h>
-#include <dt-bindings/zmk/bt.h>
-#include <dt-bindings/zmk/rgb.h>
-
-/ {
-    conditional_layers {
-        compatible = "zmk,conditional-layers";
-        tri_layer {
-            if-layers = <1 2>;
-            then-layer = <3>;
-        };
-    };
-
-    keymap {
-        compatible = "zmk,keymap";
-
-        default_layer {
-// ----------------------------------------------------------------------------------------
-// |      |     | ESC |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |   DEL     |
-// |  TAB |  Q  |  W  |  E   |  R   |  T   |   Y  |  U   |  I   |  O   |  P   |   BKSP    |
-// | CAPS |  A  |  S  |  D   |  F   |  G   |   H  |  J   |  K   |  L   |  ;   |   RET     |
-// | SHFT |  Z  |  X  |  C   |  V   |  B   |   N  |  M   |  ,   |  .   |    SHFT(/)       |
-// | CTRL | GUI | ALT |      LOWER(SPACE)  | RAISE(SPACE)|  ALT | GUI  |    CTRL(\)       |
-// |
-            bindings = <
-                        &kp ESC  &kp F1  &kp F2       &kp F3  &kp F4       &kp F5  &kp F6     &kp F7    &kp F8    &kp DEL
-   &kp TAB     &kp Q    &kp W    &kp E   &kp R        &kp T   &kp Y        &kp U   &kp I      &kp O     &kp P     &kp BSPC
-   &kp CAPS    &kp A    &kp S    &kp D   &kp F        &kp G   &kp H        &kp J   &kp K      &kp L     &kp SEMI  &kp RET
-   &kp LSHFT   &kp Z    &kp X    &kp C   &kp V        &kp B   &kp N        &kp M   &kp COMMA  &kp DOT             &mt RSHFT FSLH
-   &kp LCTRL   &kp LCMD &kp LALT         &lt 1 SPACE          &lt 2 SPACE                     &kp RALT  &kp RCMD  &mt RCTRL BSLH
-            >;
-        };
-
-        lower_layer {
-// --------------------------------------------------------------------------------------------
-// |      |     |     |  F9  |  F10  |  F11  |  F12  |  INS  |  PAU  |  SCR   |  PSCR  |      |
-// |  ~   |  !  |  @  |  #   |  $    |  %    |   ^   |  &    |  *    |  (     |  )     |      |
-// |  NAV |     |     |      |       |       |       |  _    |  +    |  {     |  }     |  "   |
-// |      |     |     |      |       |       |       |       |       |        |      ?        |
-// |      |     |     |                      |               |       |        |      |        |
-// |
-            bindings = <
-                       &trans     &kp F9   &kp F10  &kp F11    &kp F12    &kp INS   &kp PAUSE_BREAK  &kp SLCK   &kp PSCRN  &trans
-   &kp TILDE &kp EXCL  &kp AT     &kp HASH &kp DLLR &kp PRCNT  &kp CARET  &kp AMPS  &kp ASTRK        &kp LPAR   &kp RPAR   &trans
-   &mo 4     &none     &none      &none    &none    &none      &none      &kp UNDER &kp PLUS         &kp LBRC   &kp RBRC   &kp DQT
-   &trans    &none     &none      &none    &none    &none      &none      &none     &none            &none                 &kp QMARK
-   &trans    &trans    &trans              &trans              &trans                                &trans     &trans     &kp PIPE
-            >;
-        };
-
-        raise_layer {
-// --------------------------------------------------------------------------------------
-// |      |     |     |  F9  |  F10  |  F11  |  F12  | MUTE | VOL+ | VOL- | PLAY |      |
-// |   `  |  1  |  2  |  3   |   4   |   5   |   6   |   7  |   8  |   9  |  0   |      |
-// |  NAV |     |     |      |       |       |       |  -   |   =  |  [   |  ]   |   '  |
-// |      |     |     |      |       |       |       |  +   |   <  |  >   |     :       |
-// |      |     |     |                      |              |      |      |     |       |
-// |
-            bindings = <
-                       &trans     &kp F9   &kp F10  &kp F11   &kp F12   &kp C_MUTE  &kp C_VOL_UP  &kp C_VOL_DN   &kp C_PLAY  &trans
-   &kp GRAVE &kp N1    &kp N2     &kp N3   &kp N4   &kp N5    &kp N6    &kp N7      &kp N8        &kp N9         &kp N0      &trans
-   &mo 4     &none     &none      &none    &none    &none     &none     &kp MINUS   &kp EQUAL     &kp LBKT       &kp RBKT    &kp SQT
-   &trans    &none     &none      &none    &none    &none     &none     &kp PLUS    &kp LT        &kp GT                     &kp COLON
-   &trans    &trans    &trans              &trans             &trans                              &trans         &trans      &kp PIPE
-            >;
-        };
-
-        adjust_layer {
-// ------------------------------------------------------------------------------------------------------------------------
-// |          |          | BT CLR   |    BT1   |   BT2    |  BT3      |   BT4  |   BT5  |        |       |      | BT CLR  |
-// | RGB BRI+ | RGB SAT+ | RGB HUE+ | RGB ANI+ |          |  RGB TOG  |        |        |        |       |      |         |
-// | RGB BRI- | RGB SAT- | RGB HUE- | RGB ANI- |          |           |        |        |        |       |      |         |
-// |          |          |          |          |          |           |  BOOT  |        |        |       |                |
-// |          |          |          |                                 |                 |        |       |                |
-// |
-            bindings = <
-                                     &bt BT_CLR       &bt BT_SEL 0     &bt BT_SEL 1  &bt BT_SEL 2     &bt BT_SEL 3   &bt BT_SEL 4   &none    &none   &none   &bt BT_CLR
-   &rgb_ug RGB_BRI  &rgb_ug RGB_SAI  &rgb_ug RGB_HUI  &rgb_ug RGB_EFF  &none         &rgb_ug RGB_TOG  &none          &none          &none    &none   &none   &none
-   &rgb_ug RGB_BRD  &rgb_ug RGB_SAD  &rgb_ug RGB_HUD  &rgb_ug RGB_EFR  &none         &none            &none          &none          &none    &none   &none   &none
-   &trans           &none            &none            &none            &none         &none            &bootloader    &none          &none    &none           &none
-   &trans           &trans           &trans                            &trans                         &trans                                 &none   &none   &none
-            >;
-        };
-
-        nav_layer {
-// ------------------------------------------------------------------------------------------------------------------------
-// |          |          |    ESC   |          |          |           |        |        |        |       |      |   DEL   |
-// | TAB      |          |    UP    |          |          |           |        |        |        |       |      |  BSPC   |
-// | NAV      |   LEFT   |   DOWN   |   RIGHT  |          |           |  LEFT  |  DOWN  |  UP    | RIGHT |      |  ENTER  |
-// | SHIFT    |          |          |          |          |           |  HOME  |  END   |  PGUP  | PGDN  |     SHIFT      |
-// | CTRL     |   GUI    |  ALT     |            SPACE                |      SPACE      |  ALT   | GUI   |     CTRL       |
-// |
-            bindings = <
-                          &kp ESC   &none      &none     &none     &none      &none     &none      &none      &none     &kp DEL
-   &kp TAB      &none     &kp UP    &none      &none     &none     &none      &none     &none      &none      &none     &kp BSPC
-   &trans       &kp LEFT  &kp DOWN  &kp RIGHT  &none     &none     &kp LEFT   &kp DOWN  &kp UP     &kp RIGHT  &none     &kp RET
-   &kp LSHFT    &none     &none     &none      &none     &none     &kp HOME   &kp END   &kp PG_UP  &kp PG_DN            &kp RSHFT
-   &kp LCTRL    &kp LCMD  &kp LALT             &kp SPACE           &kp SPACE                       &kp LALT   &kp RCMD  &kp RCTRL
-            >;
-        };
-    };
-};
--- a/app/boards/shields/reviung53/reviung53.overlay
+++ b/app/boards/shields/reviung53/reviung53.overlay
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 2023 The ZMK Contributors
- *
- * SPDX-License-Identifier: MIT
- */
-
-#include <dt-bindings/zmk/matrix_transform.h>
-
-/ {
-    chosen {
-        zmk,kscan = &kscan0;
-        zmk,matrix_transform = &default_transform;
-    };
-
-    default_transform: keymap_transform_0 {
-        compatible = "zmk,matrix-transform";
-        columns = <8>;
-        rows = <7>;
-
-        map = <
-                RC(0,2) RC(0,3) RC(0,4) RC(0,5) RC(0,6) RC(0,7) RC(4,0) RC(4,1) RC(4,2) RC(4,3)
-RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5) RC(1,6) RC(1,7) RC(4,4) RC(4,5) RC(4,6) RC(4,7)
-RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(2,6) RC(2,7) RC(5,0) RC(5,1) RC(5,2) RC(5,3)
-RC(3,0) RC(3,1) RC(3,2) RC(3,3) RC(3,4) RC(3,5) RC(3,6) RC(3,7) RC(5,4) RC(5,5)         RC(5,6)
-RC(6,0) RC(6,1) RC(6,2)      RC(6,3)         RC(6,4)                    RC(6,5) RC(6,6) RC(6,7)
-        >;
-    };
-
-    kscan0: kscan_0 {
-        compatible = "zmk,kscan-gpio-matrix";
-        label = "KSCAN";
-        diode-direction = "col2row";
-
-        col-gpios
-            = <&pro_micro 21 GPIO_ACTIVE_HIGH>
-            , <&pro_micro 20 GPIO_ACTIVE_HIGH>
-            , <&pro_micro 19 GPIO_ACTIVE_HIGH>
-            , <&pro_micro 18 GPIO_ACTIVE_HIGH>
-            , <&pro_micro 15 GPIO_ACTIVE_HIGH>
-            , <&pro_micro 14 GPIO_ACTIVE_HIGH>
-            , <&pro_micro 16 GPIO_ACTIVE_HIGH>
-            , <&pro_micro 10 GPIO_ACTIVE_HIGH>
-            ;
-
-        row-gpios
-            = <&pro_micro 3 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-            , <&pro_micro 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-            , <&pro_micro 5 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-            , <&pro_micro 6 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-            , <&pro_micro 7 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-            , <&pro_micro 8 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-            , <&pro_micro 9 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-            ;
-
-    };
-};
--- a/app/boards/shields/reviung53/reviung53.zmk.yml
+++ b/app/boards/shields/reviung53/reviung53.zmk.yml
@@ -1,9 +0,0 @@
-file_format: "1"
-id: reviung53
-name: REVIUNG53
-type: shield
-url: https://github.com/gtips/reviung/tree/master/reviung53
-requires: [pro_micro]
-features:
-  - keys
-  - underglow
--- a/app/boards/shields/romac_plus/romac_plus.dtsi
+++ b/app/boards/shields/romac_plus/romac_plus.dtsi
@@ -43,14 +43,13 @@ RC(3,0) RC(3,1) RC(3,2)
        label = "LEFT_ENCODER";
        a-gpios = <&pro_micro 16 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
        b-gpios = <&pro_micro 14 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
-        steps = <80>;
+        resolution = <4>;
        status = "disabled";
    };

-    sensors: sensors {
+    sensors {
        compatible = "zmk,keymap-sensors";
        sensors = <&left_encoder>;
-        triggers-per-rotation = <20>;
    };

    // TODO: per-key RGB node(s)?
--- a/app/boards/shields/snap/snap.dtsi
+++ b/app/boards/shields/snap/snap.dtsi
@@ -16,14 +16,14 @@
    left_encoder: encoder_left {
        compatible = "alps,ec11";
        label = "LEFT_ENCODER";
-        steps = <80>;
+        resolution = <4>;
        status = "disabled";
    };

    right_encoder: encoder_right {
        compatible = "alps,ec11";
        label = "RIGHT_ENCODER";
-        steps = <80>;
+        resolution = <4>;
        status = "disabled";
    };

--- a/app/boards/shields/snap/snap.keymap
+++ b/app/boards/shields/snap/snap.keymap
@@ -13,7 +13,6 @@
    sensors {
        compatible = "zmk,keymap-sensors";
        sensors = <&left_encoder &right_encoder>;
-        triggers-per-rotation = <20>;
    };

    keymap {
--- a/app/boards/shields/sofle/Kconfig.defconfig
+++ b/app/boards/shields/sofle/Kconfig.defconfig
@@ -46,10 +46,4 @@ endchoice

 endif # LVGL

-if ZMK_RGB_UNDERGLOW
-
-config WS2812_STRIP
-    default y
-endif
-
 endif
--- a/app/boards/shields/sofle/boards/nice_nano.overlay
+++ b/app/boards/shields/sofle/boards/nice_nano.overlay
@@ -1,51 +0,0 @@
-#include <dt-bindings/led/led.h>
-
-&pinctrl {
-    spi3_default: spi3_default {
-        group1 {
-            psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
-        };
-    };
-
-    spi3_sleep: spi3_sleep {
-        group1 {
-            psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
-            low-power-enable;
-        };
-    };
-};
-
-&spi3 {
-    compatible = "nordic,nrf-spim";
-    status = "okay";
-
-    pinctrl-0 = <&spi3_default>;
-    pinctrl-1 = <&spi3_sleep>;
-    pinctrl-names = "default", "sleep";
-
-    led_strip: ws2812@0 {
-        compatible = "worldsemi,ws2812-spi";
-        label = "WS2812";
-
-        /* SPI */
-        reg = <0>; /* ignored, but necessary for SPI bindings */
-        spi-max-frequency = <4000000>;
-
-        /* WS2812 */
-        chain-length = <36>; /* arbitrary; change at will */
-        spi-one-frame = <0x70>;
-        spi-zero-frame = <0x40>;
-
-        color-mapping = <
-            LED_COLOR_ID_GREEN
-            LED_COLOR_ID_RED
-            LED_COLOR_ID_BLUE
-        >;
-    };
-};
-
-/ {
-    chosen {
-        zmk,underglow = &led_strip;
-    };
-};
--- a/app/boards/shields/sofle/boards/nice_nano_v2.overlay
+++ b/app/boards/shields/sofle/boards/nice_nano_v2.overlay
@@ -1,51 +0,0 @@
-#include <dt-bindings/led/led.h>
-
-&pinctrl {
-    spi3_default: spi3_default {
-        group1 {
-            psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
-        };
-    };
-
-    spi3_sleep: spi3_sleep {
-        group1 {
-            psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
-            low-power-enable;
-        };
-    };
-};
-
-&spi3 {
-    compatible = "nordic,nrf-spim";
-    status = "okay";
-
-    pinctrl-0 = <&spi3_default>;
-    pinctrl-1 = <&spi3_sleep>;
-    pinctrl-names = "default", "sleep";
-
-    led_strip: ws2812@0 {
-        compatible = "worldsemi,ws2812-spi";
-        label = "WS2812";
-
-        /* SPI */
-        reg = <0>; /* ignored, but necessary for SPI bindings */
-        spi-max-frequency = <4000000>;
-
-        /* WS2812 */
-        chain-length = <36>; /* arbitrary; change at will */
-        spi-one-frame = <0x70>;
-        spi-zero-frame = <0x40>;
-
-        color-mapping = <
-            LED_COLOR_ID_GREEN
-            LED_COLOR_ID_RED
-            LED_COLOR_ID_BLUE
-        >;
-    };
-};
-
-/ {
-    chosen {
-        zmk,underglow = &led_strip;
-    };
-};
--- a/app/boards/shields/sofle/boards/nrfmicro_11.overlay
+++ b/app/boards/shields/sofle/boards/nrfmicro_11.overlay
@@ -1,51 +0,0 @@
-#include <dt-bindings/led/led.h>
-
-&pinctrl {
-    spi3_default: spi3_default {
-        group1 {
-            psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
-        };
-    };
-
-    spi3_sleep: spi3_sleep {
-        group1 {
-            psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
-            low-power-enable;
-        };
-    };
-};
-
-&spi3 {
-    compatible = "nordic,nrf-spim";
-    status = "okay";
-
-    pinctrl-0 = <&spi3_default>;
-    pinctrl-1 = <&spi3_sleep>;
-    pinctrl-names = "default", "sleep";
-
-    led_strip: ws2812@0 {
-        compatible = "worldsemi,ws2812-spi";
-        label = "WS2812";
-
-        /* SPI */
-        reg = <0>; /* ignored, but necessary for SPI bindings */
-        spi-max-frequency = <4000000>;
-
-        /* WS2812 */
-        chain-length = <36>; /* arbitrary; change at will */
-        spi-one-frame = <0x70>;
-        spi-zero-frame = <0x40>;
-
-        color-mapping = <
-            LED_COLOR_ID_GREEN
-            LED_COLOR_ID_RED
-            LED_COLOR_ID_BLUE
-        >;
-    };
-};
-
-/ {
-    chosen {
-        zmk,underglow = &led_strip;
-    };
-};
--- a/app/boards/shields/sofle/boards/nrfmicro_13.overlay
+++ b/app/boards/shields/sofle/boards/nrfmicro_13.overlay
@@ -1,51 +0,0 @@
-#include <dt-bindings/led/led.h>
-
-&pinctrl {
-    spi3_default: spi3_default {
-        group1 {
-            psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
-        };
-    };
-
-    spi3_sleep: spi3_sleep {
-        group1 {
-            psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
-            low-power-enable;
-        };
-    };
-};
-
-&spi3 {
-    compatible = "nordic,nrf-spim";
-    status = "okay";
-
-    pinctrl-0 = <&spi3_default>;
-    pinctrl-1 = <&spi3_sleep>;
-    pinctrl-names = "default", "sleep";
-
-    led_strip: ws2812@0 {
-        compatible = "worldsemi,ws2812-spi";
-        label = "WS2812";
-
-        /* SPI */
-        reg = <0>; /* ignored, but necessary for SPI bindings */
-        spi-max-frequency = <4000000>;
-
-        /* WS2812 */
-        chain-length = <36>; /* arbitrary; change at will */
-        spi-one-frame = <0x70>;
-        spi-zero-frame = <0x40>;
-
-        color-mapping = <
-            LED_COLOR_ID_GREEN
-            LED_COLOR_ID_RED
-            LED_COLOR_ID_BLUE
-        >;
-    };
-};
-
-/ {
-    chosen {
-        zmk,underglow = &led_strip;
-    };
-};
--- a/Show More
+++ b/Show More