diff --git a/config/base.keymap b/config/base.keymap
index 7813a5c..3cb2d09 100644
--- a/config/base.keymap
+++ b/config/base.keymap
@@ -120,10 +120,11 @@ ZMK_TAP_DANCE(num_dance,
     tapping-term-ms = <200>;
     bindings = <&num_word>, <&sl NUM>;  // reverse this for sticky-num on single tap
 )
-&num_word {  // num-word, requires PR #1451
+ZMK_AUTO_LAYER(num_word,
     layers = <NUM>;
-    continue-list = <BSPC DEL DOT COMMA PLUS MINUS STAR FSLH EQUAL>;
-};
+    ignore-numbers;
+    continue-list = <BACKSPACE DELETE DOT COMMA PLUS MINUS STAR FSLH EQUAL>;
+)
 
 // smart-mouse, requires PR #1366
 ZMK_TRI_STATE(smart_mouse,
diff --git a/config/west.yml b/config/west.yml
index 6f0a69e..84bdf12 100644
--- a/config/west.yml
+++ b/config/west.yml
@@ -7,10 +7,16 @@ manifest:
   projects:
     - name: zmk
       remote: urob
-      revision: main
+      revision: going-modular
       import: app/west.yml
     - name: zmk-helpers
       remote: urob
       revision: main
+    - name: zmk-auto-layer
+      remote: urob
+      revision: main
+    - name: zmk-tri-state
+      remote: urob
+      revision: main
   self:
     path: config