diff --git a/config/corne.keymap b/config/corne.keymap
index 3a899a1..cfc87ef 100644
--- a/config/corne.keymap
+++ b/config/corne.keymap
@@ -103,6 +103,9 @@ ZMK_HOLD_TAP(ht_tog,
 )
 &caps_word {  // mods deactivate caps-word, requires PR #1451
     /delete-property/ ignore-modifiers;
+    /delete-property/ ignore-numbers;
+    /delete-property/ ignore-gamers;
+    continue-list = <UNDERSCORE MINUS BACKSPACE DELETE SPACE>;
 };
 
 
@@ -134,7 +137,7 @@ ZMK_HOLD_TAP(ht_tog,
 
 &rpi LGUI ESC            &kp Q                     &kp W             &kp F              &kp P                     &kp B             &kp J         &kp L              &kp U       &kp Y     &kp SEMICOLON   &rpi LGUI TAB
 &kp BSPC                 &kp A                     &kp R             &kp S              &kp T                     &kp G             &kp M         &kp N              &kp E       &kp I     &kp O           &kp SQT
-&kp LGUI                 &kp Z                     &kp X             &kp C              &kp D                     &kp V             &kp K         &kp H              &kp COMMA   &kp DOT   &kp FSLH        &to FN
+&kp CAPS                 &kp Z                     &kp X             &kp C              &kp D                     &kp V             &kp K         &kp H              &kp COMMA   &kp DOT   &kp FSLH        &to FN
                                         &ht_tog LALT NUM         &rpi LEFT_CONTROL SPACE   &left_smart_shift_num       &right_smart_shift_num        &rpi LGUI ENTER           &mo SYM
             >;
         };
diff --git a/config/west.yml b/config/west.yml
index 948fc0c..e3e66d1 100644
--- a/config/west.yml
+++ b/config/west.yml
@@ -52,6 +52,9 @@ manifest:
       remote: ficcdaf
       path: modules/zmk/nice-view-gem
       revision: main
+    - name: zmk-auto-layer
+      remote: urob
+      revision: v0.1 # set to same version as zmk above
 
     # Temporarily overload Zephyr until
     # https://github.com/zmkfirmware/zephyr/pull/40 is merged.
diff --git a/draw/keymap.png b/draw/keymap.png
index 8c32ea4..3defc6e 100644
Binary files a/draw/keymap.png and b/draw/keymap.png differ