diff --git a/config/sofle.keymap b/config/sofle.keymap
index dc05452..2045070 100644
--- a/config/sofle.keymap
+++ b/config/sofle.keymap
@@ -9,12 +9,18 @@
 #include <dt-bindings/zmk/ext_power.h>
 #include <dt-bindings/zmk/keys.h>
 #include <dt-bindings/zmk/rgb.h>
+#include <zmk-helpers/helper.h>
+#include <zmk-helpers/key-labels/sofle.h>
 
 #define BASE 0
 #define LOWER 1
 #define RAISE 2
 #define ADJUST 3
 
+#define KEYS_L LN0 LN1 LN2 LN3 LN4 LN5 LT0 LT1 LT2 LT3 LT4 LT5 LM0 LM1 LM2 LM3 LM4 LM5 LB0 LB1 LB2 LB3 LB4 LB5 // Left-hand keys.
+#define KEYS_R RN0 RN1 RN2 RN3 RN4 RN5 RT0 RT1 RT2 RT3 RT4 RT5 RM0 RM1 RM2 RM3 RM4 RM5 RB0 RB1 RB2 RB3 RB4 RB5 // Right-hand keys.
+#define THUMBS LH4 LH3 LH2 LH1 LH0 RH0 RH1 RH2 RH3 RH4 // Thumb keys.
+
 / {
     // Activate ADJUST layer by pressing raise and lower
 
@@ -44,7 +50,7 @@
             tapping-term-ms = <280>;
             quick-tap-ms = <175>;
             bindings = <&kp>, <&kp>;
-            hold-trigger-key-positions = <30 31 32 33>; // List of keys on the right side of the keyboard
+            hold-trigger-key-positions = <KEYS_R THUMBS>; // List of keys on the right side of the keyboard
             hold-trigger-on-release;
         };
         hmr: home_row_mod_right {
@@ -55,7 +61,7 @@
             tapping-term-ms = <280>;
             quick-tap-ms = <175>;
             bindings = <&kp>, <&kp>;
-            hold-trigger-key-positions = <24 25 26 27>; // List of keys on the left side of the keyboard
+            hold-trigger-key-positions = <KEYS_L THUMBS>; // List of keys on the left side of the keyboard
             hold-trigger-on-release;
         };
     };
@@ -74,16 +80,22 @@
             //               | =/+ | Ctrl+F12  | ALT | LOWER|  SPACE |  | ENTER | RAISE| TAB  | DEL   | ESC  |
 
             bindings = <
-&kp GRAVE  &kp N1  &kp N2     &kp N3       &kp N4    &kp N5                                     &kp N6      &kp N7   &kp N8     &kp N9     &kp N0    &kp MINUS
-&kp BSPC  &kp Q   &kp W      &kp E        &kp R     &mt LBRC T                                 &mt RBRC Y  &kp U    &kp I      &kp O      &kp P     &kp BSLH
-&kp LSHFT   &hml LEFT_WIN A   &hml LALT S      &hml LCTRL D        &hml LSHIFT F     &mt HOME G                                 &mt END H   &hmr RSHIFT J    &hmr RCTRL K   &hmr RALT L   &hmr RIGHT_WIN SEMI  &kp SQT
-&kp LCTRL  &kp Z   &kp X      &kp C        &kp V     &mt LBKT B  &kp LEFT_WIN   &kp LG(LS(S)) &mt RBKT N  &kp M    &kp COMMA  &kp DOT    &kp FSLH  &kp RSHFT
-                   &kp EQUAL  &kp LC(F12)  &kp LALT  &mo LOWER   &kp SPACE        &kp RET       &mo RAISE   &kp TAB  &kp DEL     &kp ESC
+            //╭─────────────┬─────────────┬─────────────┬─────────────┬─────────────┬─────────────┬─────────────╮ ╭─────────────┬─────────────┬─────────────┬─────────────┬─────────────┬─────────────┬─────────────╮ 
+                &kp GRAVE     &kp N1        &kp N2        &kp N3        &kp N4        &kp N5                                      &kp N6        &kp N7        &kp N8        &kp N9        &kp N0        &kp MINUS
+            //├─────────────┼─────────────┼─────────────┼─────────────┼─────────────┼─────────────┼─────────────┤ ├─────────────┼─────────────┼─────────────┼─────────────┼─────────────┼─────────────┼─────────────┤
+                &kp BSPC      &kp Q         &kp W         &kp E         &kp R         &mt LBRC T                                  &mt RBRC Y    &kp U         &kp I         &kp O         &kp P         &kp BSLH
+            //├─────────────┼─────────────┼─────────────┼─────────────┼─────────────┼─────────────┼─────────────┤ ├─────────────┼─────────────┼─────────────┼─────────────┼─────────────┼─────────────┼─────────────┤
+                &kp LSHFT     &hml LGUI A   &hml LALT S   &hml LSHIFT D &hml LCTRL F  &mt HOME G                                  &mt END H     &hmr RCTRL J  &hmr RSHIFT K &hmr RALT L   &hmr LGUI SEMI &kp SQT
+            //├─────────────┼─────────────┼─────────────┼─────────────┼─────────────┼─────────────┼─────────────┤ ├─────────────┼─────────────┼─────────────┼─────────────┼─────────────┼─────────────┼─────────────┤
+                &kp LCTRL     &kp Z         &kp X         &kp C         &kp V         &mt LBKT B    &kp LGUI        &kp LG(LS(S)) &mt RBKT N    &kp M         &kp COMMA     &kp DOT       &kp FSLH      &kp RSHFT
+            //├─────────────┼─────────────┼─────────────┼─────────────┼─────────────┼─────────────┼─────────────┤ ├─────────────┼─────────────┼─────────────┼─────────────┼─────────────┼─────────────┼─────────────┤
+                                            &kp EQUAL     &kp LC(F12)   &kp LALT      &mo LOWER   &kp SPACE         &kp RET       &mo RAISE     &kp TAB       &kp DEL       &kp ESC
+            //                            ╰─────────────┴────────────┴────────────┴────────────┴─────────────╯    ╰─────────────┴────────────┴────────────┴────────────┴─────────────╯
             >;
 
             sensor-bindings =
                 <&inc_dec_kp LEFT RIGHT>,
-                <&inc_dec_kp PG_UP PG_DN>;
+                <&inc_dec_kp DOWN UP>;
         };
 
         lower_layer {
diff --git a/config/west.yml b/config/west.yml
index afe7ba8..eb4ed3a 100644
--- a/config/west.yml
+++ b/config/west.yml
@@ -8,6 +8,8 @@ manifest:
       url-base: https://github.com/whoop-t
     - name: averymd
       url-base: https://github.com/averymd
+    - name: urob
+      url-base: https://github.com/urob
   projects:
     - name: zmk
       remote: zmkfirmware
@@ -19,5 +21,8 @@ manifest:
     - name: zmk-nice-oled
       remote: averymd
       revision: main
+    - name: zmk-helpers
+      remote: urob
+      revision: main
   self:
     path: config