diff --git a/boards/shields/dactyl_manuform_5x7/dactyl_manuform_5x7_right.conf b/boards/shields/dactyl_manuform_5x7/dactyl_manuform_5x7_right.conf
index 389ef70..c4114d9 100644
--- a/boards/shields/dactyl_manuform_5x7/dactyl_manuform_5x7_right.conf
+++ b/boards/shields/dactyl_manuform_5x7/dactyl_manuform_5x7_right.conf
@@ -1,7 +1,4 @@
 CONFIG_SPI=y
 CONFIG_INPUT=y
 CONFIG_ZMK_MOUSE=y
-
-CONFIG_PMW33XX=y
-CONFIG_PMW33XX_3360=y
-CONFIG_PMW33XX_TRIGGER_GLOBAL_THREAD=y
+CONFIG_PMW3360=y
diff --git a/boards/shields/dactyl_manuform_5x7/dactyl_manuform_5x7_right.overlay b/boards/shields/dactyl_manuform_5x7/dactyl_manuform_5x7_right.overlay
index 0c8d736..d16795d 100644
--- a/boards/shields/dactyl_manuform_5x7/dactyl_manuform_5x7_right.overlay
+++ b/boards/shields/dactyl_manuform_5x7/dactyl_manuform_5x7_right.overlay
@@ -1,4 +1,5 @@
 #include "dactyl_manuform_5x7.dtsi"
+#include <zephyr/dt-bindings/input/input-event-codes.h>
 
 &default_transform {
     col-offset = <7>;
@@ -43,23 +44,24 @@
     };
 };
 
-&spi1 {
+&spi0 {
     status = "okay";
     compatible = "nordic,nrf-spim";
     pinctrl-0 = <&spi0_default>;
     pinctrl-1 = <&spi0_sleep>;
     pinctrl-names = "default", "sleep";
-    label = "SPI_1";
+    cs-gpios = <&gpio0 20 GPIO_ACTIVE_LOW>;
 
     trackball: trackball@0 {
         status = "okay";
-        compatible = "pixart,pmw33xx";
+        compatible = "pixart,pmw3360";
         reg = <0x0>;
         spi-max-frequency = <2000000>;
-        label = "TRACKBALL";
-        cs-gpios = <&gpio0 20 GPIO_ACTIVE_LOW>;
+        irq-gpios = <&gpio0 17 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>;
         cpi = <1600>;
-        motswk-gpios = <&gpio0 17 GPIO_ACTIVE_HIGH>;
+        evt-type = <INPUT_EV_REL>;
+        x-input-code = <INPUT_REL_X>;
+        y-input-code = <INPUT_REL_Y>;
     };
 };
 
diff --git a/config/west.yml b/config/west.yml
index 235f438..b34488c 100644
--- a/config/west.yml
+++ b/config/west.yml
@@ -1,11 +1,16 @@
 manifest:
   remotes:
     - name: zmkfirmware
+      url-base: https://github.com/petejohanson
+    - name: pmw3360-driver
       url-base: https://github.com/trentrand
   projects:
     - name: zmk
       remote: zmkfirmware
-      revision: main
+      revision: feat/pointers-move-scroll
       import: app/west.yml
+    - name: zmk-pmw3360-driver
+      remote: pmw3360-driver
+      revision: main
   self:
     path: config