diff --git a/input/config.yaml b/input/config.yaml
index 946b1ed..698bdd1 100644
--- a/input/config.yaml
+++ b/input/config.yaml
@@ -540,11 +540,11 @@ pcbs:
         what: ceoloide/switch_choc_v1_v2
         where: /(matrix|thumbs)_/
         params:
-          show_keycaps: true
-          show_corner_marks: true
+          include_keycap: true
+          include_corner_marks: true
           choc_v2_support: false
-          keycaps_x: 19
-          keycaps_y: 19
+          keycap_height: 19
+          keycap_width: 19
           from: "{{colrow}}"
           to: "{{column_net}}"
         adjust:
diff --git a/input/footprints/ceoloide b/input/footprints/ceoloide
index 51dfd80..87654b4 160000
--- a/input/footprints/ceoloide
+++ b/input/footprints/ceoloide
@@ -1 +1 @@
-Subproject commit 51dfd80314add5db395b900c277944684dd7e998
+Subproject commit 87654b4654b134e4ce3f1f9887e90a5d917d53a3
diff --git a/zmk/config/boards/shields/DeeDee/DeeDee.conf b/zmk/config/boards/shields/DeeDee/DeeDee.conf
index ec35aeb..e1d551c 100644
--- a/zmk/config/boards/shields/DeeDee/DeeDee.conf
+++ b/zmk/config/boards/shields/DeeDee/DeeDee.conf
@@ -14,3 +14,6 @@ CONFIG_ZMK_RGB_UNDERGLOW_EFF_START=3
 CONFIG_ZMK_RGB_UNDERGLOW_BRT_START=16
 CONFIG_ZMK_RGB_UNDERGLOW_BRT_MAX=32
 CONFIG_ZMK_RGB_UNDERGLOW_SPD_START=1
+
+CONFIG_EC11=y
+CONFIG_EC11_TRIGGER_GLOBAL_THREAD=y
diff --git a/zmk/config/boards/shields/DeeDee/DeeDee.keymap b/zmk/config/boards/shields/DeeDee/DeeDee.keymap
index 5dd6791..f097f3e 100644
--- a/zmk/config/boards/shields/DeeDee/DeeDee.keymap
+++ b/zmk/config/boards/shields/DeeDee/DeeDee.keymap
@@ -15,13 +15,14 @@
     flavor = "tap-preferred";
     tapping-term-ms = <285>;
     quick-tap-ms = <200>;
-    require-prior-idle-ms = <220>;
+    require-prior-idle-ms = <50>;
 };
 
 / {
     keymap {
         compatible = "zmk,keymap";
         base_layer {
+            sensor-bindings = <&inc_dec_kp LC(LS(Z)) LC(Z) &inc_dec_kp PG_UP PG_DN>;
             bindings = <
                 &kp Q      &kp W      &kp F       &kp P       &kp B    &kp J   &kp L       &kp U       &kp Y      &kp SEMI
                 &mt LGUI A &mt LALT R &mt LCTRL S &mt LSHFT T &kp G    &kp M   &mt RSHFT N &mt RCTRL E &mt LALT I	&mt RGUI O
@@ -31,15 +32,17 @@
         };
 
         numsym_layer {
+            sensor-bindings = <&inc_dec_kp LC(LS(Z)) LC(Z) &inc_dec_kp PG_UP PG_DN>;
             bindings = <
                 &kp N1         &kp N2        &kp N3         &kp N4          &kp N5    &kp N6   &kp N7   &kp N8   &kp N9   &kp N0
-                &mt LGUI TILDE &mt LALT DLLR &mt LCTRL HASH &mt LSHFT PRCNT &kp APOS  &kp PIPE &kp LPAR &kp LBRC &kp LBKT &kp EQUAL
-                &none          &none         &none          &none           &kp GRAVE &kp INS  &kp RPAR &kp RBRC &kp RBKT &kp PLUS
+                &mt LGUI MINUS &mt LALT DLLR &mt LCTRL HASH &mt LSHFT PRCNT &kp APOS  &kp PIPE &kp LPAR &kp LBRC &kp LBKT &kp EQUAL
+                &kp TILDE      &none         &none          &none           &kp GRAVE &kp INS  &kp RPAR &kp RBRC &kp RBKT &kp PLUS
                                &trans        &kp DEL        &kp RS(TAB)     &none     &none    &trans   &none    &trans
             >;
         };
 
         nav_layer {
+            sensor-bindings = <&inc_dec_kp LC(LS(Z)) LC(Z) &inc_dec_kp PG_UP PG_DN>;
             bindings = <
                 &kp LG(N1) &kp LG(N2) &kp LG(N3) &kp LG(N4) &kp LG(N5) &kp LG(N6) &kp LG(N7)  &kp LG(N8) &kp LG(N9) &none
                 &kp LGUI   &kp LALT   &kp LCTRL  &kp LSHFT  &none      &kp LEFT   &kp DOWN    &kp UP     &kp RIGHT  &none
@@ -49,6 +52,7 @@
         };
 
         funutil_layer {
+            sensor-bindings = <&inc_dec_kp LC(LS(Z)) LC(Z) &inc_dec_kp PG_UP PG_DN>;
             bindings = <
                 &kp F1       &kp F2         &kp F3       &kp F4     &kp F5     &kp F6      &kp F7     &kp F8  &kp F9     &kp F10
                 &bt BT_SEL 1 &bt BT_SEL 2   &bt BT_SEL 3 &bt BT_PRV &sys_reset &bootloader &bt BT_NXT &none   &none      &kp F11
@@ -58,6 +62,7 @@
         };
 
         mouse_layer {
+            sensor-bindings = <&inc_dec_kp LC(LS(Z)) LC(Z) &inc_dec_kp PG_UP PG_DN>;
             bindings = <
                 &none  &mkp RCLK      &mkp MCLK      &mkp LCLK      &none           &none          &mkp LCLK      &mkp MCLK    &mkp RCLK       &none
                 &none  &mmv MOVE_LEFT &mmv MOVE_UP   &mmv MOVE_DOWN &mmv MOVE_RIGHT &mmv MOVE_LEFT &mmv MOVE_DOWN &mmv MOVE_UP &mmv MOVE_RIGHT &none
diff --git a/zmk/config/boards/shields/DeeDee/DeeDee.overlay b/zmk/config/boards/shields/DeeDee/DeeDee.overlay
index 63055a7..15a1030 100644
--- a/zmk/config/boards/shields/DeeDee/DeeDee.overlay
+++ b/zmk/config/boards/shields/DeeDee/DeeDee.overlay
@@ -3,6 +3,35 @@
 / {
     //model = "DeeDee";
 
+    encoder_left: encoder_left {
+        compatible = "alps,ec11";
+        //a-gpios = <&gpio1 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
+        a-gpios = <&gpio1 4 (GPIO_ACTIVE_HIGH )>;
+        b-gpios = <&gpio1 6 (GPIO_ACTIVE_HIGH )>;
+        steps = <24>;
+        status = "okay";
+    };
+
+    encoder_right: encoder_right {
+        compatible = "alps,ec11";
+        a-gpios = <&gpio0 10 (GPIO_ACTIVE_HIGH )>;
+        b-gpios = <&gpio0 9 (GPIO_ACTIVE_HIGH )>;
+        steps = <15>;
+        status = "okay";
+    };
+
+    sensors: sensors {
+        compatible = "zmk,keymap-sensors";
+        sensors = <&encoder_left &encoder_right>;
+        encoder_left {
+            triggers-per-rotation = <24>;
+        };
+
+        encoder_right {
+            triggers-per-rotation = <30>;
+        };
+    };
+
     chosen {
         zmk,kscan = &kscan0;
         zmk,matrix_transform = &default_transform;