diff --git a/app/boards/shields/splitkb_aurora_lily58/splitkb_aurora_lily58.conf b/app/boards/shields/splitkb_aurora_lily58/splitkb_aurora_lily58.conf
index d456100a..c276aad3 100644
--- a/app/boards/shields/splitkb_aurora_lily58/splitkb_aurora_lily58.conf
+++ b/app/boards/shields/splitkb_aurora_lily58/splitkb_aurora_lily58.conf
@@ -1,6 +1,6 @@
 # Uncomment these two line to add support for encoders to your firmware
-# CONFIG_EC11=y
-# CONFIG_EC11_TRIGGER_GLOBAL_THREAD=y
+CONFIG_EC11=y
+CONFIG_EC11_TRIGGER_GLOBAL_THREAD=y
 
 # Uncomment the following line to enable the OLED Display
 # CONFIG_ZMK_DISPLAY=y
diff --git a/app/boards/shields/splitkb_aurora_lily58/splitkb_aurora_lily58.keymap b/app/boards/shields/splitkb_aurora_lily58/splitkb_aurora_lily58.keymap
index b8a9103b..c86955ed 100644
--- a/app/boards/shields/splitkb_aurora_lily58/splitkb_aurora_lily58.keymap
+++ b/app/boards/shields/splitkb_aurora_lily58/splitkb_aurora_lily58.keymap
@@ -21,11 +21,11 @@
 // | SHIFT |  Z  |  X  |  C   |  V   |  B   |   "["  |  |  "]"  |  N   |  M    |  ,    |  .   |   /   | SHIFT |
 //                     | ALT  | GUI  | LOWER|  SPACE |  | ENTER | RAISE| BSPC  | GUI   |
             bindings = <
-&kp ESC   &kp N1 &kp N2 &kp N3   &kp N4   &kp N5                     &kp N6 &kp N7   &kp N8    &kp N9  &kp N0   &kp GRAVE
-&kp TAB   &kp Q  &kp W  &kp E    &kp R    &kp T                      &kp Y  &kp U    &kp I     &kp O   &kp P    &kp MINUS
-&kp LCTRL &kp A  &kp S  &kp D    &kp F    &kp G                      &kp H  &kp J    &kp K     &kp L   &kp SEMI &kp SQT
-&kp LSHFT &kp Z  &kp X  &kp C    &kp V    &kp B  &kp LBKT   &kp RBKT &kp N  &kp M    &kp COMMA &kp DOT &kp FSLH &kp RSHFT
-                        &kp LALT &kp LGUI &mo 1  &kp SPACE  &kp RET  &mo 2  &kp BSPC &kp RGUI
+  &kp ESC         &kp N1   &kp N2      &kp N3        &kp N4            &kp N5                            &kp N6  &kp N7         &kp N8   &kp N9    &kp N0      &kp MINUS
+  &kp TAB         &kp Q    &kp W       &kp E         &kp R             &kp T                             &kp Y   &kp U          &kp I    &kp O     &kp P  &kp BACKSLASH
+&kp LSHFT         &kp A    &kp S       &kp D         &kp F             &kp G                             &kp H   &kp J          &kp K    &kp L  &kp SEMI        &kp SQT
+&kp LEFT_CONTROL  &kp Z    &kp X       &kp C         &kp V             &kp B       &kp LBKT   &kp RBKT   &kp N   &kp M      &kp COMMA  &kp DOT  &kp FSLH        &kp RET
+                           &kp GRAVE  &kp LEFT_ALT  &kp LEFT_COMMAND  &kp BACKSPACE  &kp SPACE   &mo 1   &mo 2  &kp RIGHT_ALT
             >;
 
             sensor-bindings = <&inc_dec_kp C_VOL_UP C_VOL_DN>;
@@ -39,11 +39,11 @@
 // |       |     |     |      |      |      |        |  |       |      |  _    |  +    |  {   |   }   |  "|"  |
 //                     |      |      |      |        |  |       |      |       |       |
             bindings = <
-&bt BT_CLR &bt BT_SEL 0     &bt BT_SEL 1      &bt BT_SEL 2      &bt BT_SEL 3 &bt BT_SEL 4                 &trans    &trans    &trans          &trans    &trans    &trans
-&kp F1     &kp F2           &kp F3            &kp F4            &kp F5       &kp F6                       &kp F7    &kp F8    &kp F9          &kp F10   &kp F11   &kp F12
-&kp GRAVE  &kp EXCL         &kp AT            &kp HASH          &kp DOLLAR   &kp PRCNT                    &kp CARET &kp AMPS  &kp STAR         &kp LPAR  &kp RPAR  &kp TILDE
-&trans     &ext_power EP_ON &ext_power EP_OFF &ext_power EP_TOG &trans       &trans    &trans   &trans    &trans    &kp MINUS &kp PLUS        &kp LBRC  &kp RBRC  &kp PIPE
-                                              &trans            &trans       &trans    &trans   &trans    &trans    &trans    &trans
+&trans    &trans      &trans     &trans     &trans     &trans                            &trans         &trans          &trans          &trans        &trans            &trans
+&kp ESC   &kp N1      &kp N2     &kp N3     &kp N4     &kp N5                            &kp N6          &kp N7          &kp N8          &kp N9        &kp N0           &kp MINUS
+&trans    &kp LPAR    &kp LBKT   &kp RBKT   &kp RPAR   &none                             &kp CARET       &kp LEFT_ARROW  &kp DOWN_ARROW  &kp UP_ARROW  &kp RIGHT_ARROW  &kp EQUAL
+&trans    &kp GRAVE   &none      &none      &trans     &trans  &bt BT_CLR   &bt BT_NEXT  &kp CAPSLOCK    &kp MINUS       &kp COMMA       &kp DOT       &kp SLASH        &kp ENTER
+                                    &trans  &trans  &trans  &trans                   &trans  &trans  &trans  &trans
             >;
 
             sensor-bindings = <&inc_dec_kp C_VOL_UP C_VOL_DN>;
@@ -57,11 +57,11 @@
 // |   F7  |  F8 |  F9 |  F10 |  F11 |  F12 |        |  |       |  +   |   -   |   =   |  [   |   ]   |   \   |
 //                     |      |      |      |        |  |       |      |       |       |
             bindings = <
-&trans    &trans &trans &trans  &trans  &trans                       &trans      &trans    &trans    &trans   &trans    &trans
-&kp GRAVE &kp N1 &kp N2 &kp N3  &kp N4  &kp N5                       &kp N6      &kp N7    &kp N8    &kp N9   &kp N0    &trans
-&kp F1    &kp F2 &kp F3 &kp F4  &kp F5  &kp F6                       &trans      &kp LEFT  &kp DOWN  &kp UP   &kp RIGHT &trans
-&kp F7    &kp F8 &kp F9 &kp F10 &kp F11 &kp F12   &trans   &trans    &kp KP_PLUS &kp MINUS &kp EQUAL &kp LBKT &kp RBKT  &kp BSLH
-                        &trans  &trans  &trans    &trans   &trans    &trans      &trans    &trans
+&trans  &trans  &trans   &trans  &trans  &trans               &trans  &trans  &trans &trans &trans   &trans
+&trans  &none   &none    &none   &none   &none                &none   &none   &none  &none  &none    &none
+&kp F1  &kp F2   &kp F3  &kp F4  &kp F5  &kp F6              &kp F7  &kp F8 &kp F9 &kp F10  &kp F11 &kp F12
+&trans  &trans   &none    &none   &none   &none  &none  &none  &none   &none   &none  &none  &none    &none
+                         &none  &none  &none  &none      &none  &none  &none  &none
             >;
 
             sensor-bindings = <&inc_dec_kp C_VOL_UP C_VOL_DN>;