diff --git a/config/cradio.keymap b/config/cradio.keymap
index 0d6f2f3..f517e34 100644
--- a/config/cradio.keymap
+++ b/config/cradio.keymap
@@ -307,28 +307,28 @@
 
         MOU {
             bindings = <
-&kp TAB           &kp LC(UP) &kp LS(LC(TAB))  &kp LC(TAB)       &kp LG(RBKT) &msc SCRL_DOWN  &msc SCRL_RIGHT &mmv MOVE_UP    &msc SCRL_LEFT  &kp BSPC
-&kp LCTRL         &kp LALT   &kp LSHFT        &kp LGUI          &kp LG(LBKT) &msc SCRL_UP    &mmv MOVE_LEFT  &mmv MOVE_DOWN  &mmv MOVE_RIGHT &kp ENTER
-&hrml GLOBE LG(Z) &kp LG(X)  &kp LG(C)        &mt HP(V) LG(V)   &kp F18      &playnp         &mkp MCLK       &vb_dn          &vb_up        &kp DEL
-                                              &mnav             &kp SPACE    &mkp LCLK       &mkp RCLK            
+  &kp TAB           &kp LC(UP) &kp LS(LC(TAB))  &kp LC(TAB) &kp LG(RBKT) &msc SCRL_DOWN  &msc SCRL_RIGHT &mmv MOVE_UP    &msc SCRL_LEFT  &kp BSPC
+  &kp LCTRL         &kp LALT   &kp LSHFT        &kp LGUI    &kp LG(LBKT) &msc SCRL_UP    &mmv MOVE_LEFT  &mmv MOVE_DOWN  &mmv MOVE_RIGHT &kp ENTER
+  &hrml GLOBE LG(Z) &kp LG(X)  &kp LG(C)        &kp LG(V)   &kp F18      &playnp         &mkp MCLK       &vb_dn          &vb_up          &kp DEL
+                                                &trans      &kp SPACE    &mkp LCLK       &mkp RCLK            
             >;          
         };
 
         NUM { // keypad is almost mirrored to allow for use with and without a mouse
             bindings = <
-  &trans &trans &trans &trans  &trans        &kp PLUS            &kp N7  &kp N8  &kp N9  &kp ASTRK
-  &trans &trans &trans &trans  &trans        &kp MINUS           &kp N4  &kp N5  &kp N6  &kp SLASH
-  &trans &trans &trans &trans  &trans        &kp COMMA           &kp N1  &kp N2  &kp N3  &kp KP_DOT
-                       &lc NAV &kp K_CANCEL  &mt K_CANCEL SPACE  &lt SYM N0
+  &trans &trans &trans &trans  &trans  &kp PLUS           &kp N7          &kp N8          &kp N9         &kp ASTRK
+  &trans &trans &trans &trans  &trans  &hrmr HYPER MINUS  &hrmr RGUI N4   &hrmr RSHFT N5  &hrmr RALT N6  &hrmr RCTRL SLASH
+  &trans &trans &trans &trans  &trans  &kp COMMA          &kp N1          &kp N2          &kp N3         &kp KP_DOT
+                       &lc NAV &trans  &lt NAV SPACE      &lt SYM N0
             >;
         };
 
         NAV {
             bindings = <
-  &kp TAB           &swapper   &kp LS(LC(TAB))  &kp LC(TAB)  &kp LG(RBKT)  &kp PG_UP  &kp HOME  &kp UP    &kp END    &kp BSPC
-  &sk LCTRL         &sk LALT   &sk LSHFT        &sk LGUI     &kp LG(LBKT)  &kp PG_DN  &kp LEFT  &kp DOWN  &kp RIGHT  &kp RET
-  &hrml GLOBE LG(Z) &kp LG(X)  &kp LG(C)        &kp LG(V)    &kp F18       &playnp    &kp F19   &vb_dn    &vb_up     &kp DEL
-                                                &trans       &kp SPACE     &trans     &trans   
+  &kp TAB           &swapper  &kp LS(LC(TAB)) &kp LC(TAB) &kp LG(RBKT)  &kp PG_UP &kp HOME &kp UP   &kp END   &kp BSPC
+  &sk LCTRL         &sk LALT  &sk LSHFT       &sk LGUI    &kp LG(LBKT)  &kp PG_DN &kp LEFT &kp DOWN &kp RIGHT &kp RET
+  &hrml GLOBE LG(Z) &kp LG(X) &kp LG(C)       &kp LG(V)   &kp F18       &playnp   &kp F19  &vb_dn   &vb_up    &kp DEL
+                                              &trans      &kp SPACE     &trans    &trans   
             >;
         };
 
@@ -343,15 +343,13 @@
 
         FUN {
             bindings = <
-  &kp N1     &kp N2    &kp N3     &kp N4    &kp N5              &kp N6    &kp N7    &kp N8     &kp N9    &kp N0
-  &sk LCTRL  &sk LALT  &sk LSHFT  &sk LGUI  &kp F11             &kp F12   &sk RGUI  &sk LSHFT  &sk RALT  &sk RCTRL
-  &kp F1     &kp F2    &kp F3     &kp F4    &kp F5              &kp F6    &kp F7    &kp F8     &kp F9    &kp F10
-                                  &trans    &kp LG(LA(C_POWER)) &kp CAPS  &trans
+  &kp N1     &kp N2    &kp N3     &kp N4    &kp N5      &kp N6    &kp N7    &kp N8     &kp N9    &kp N0
+  &sk LCTRL  &sk LALT  &sk LSHFT  &sk LGUI  &kp F11     &kp F12   &sk RGUI  &sk LSHFT  &sk RALT  &sk RCTRL
+  &kp F1     &kp F2    &kp F3     &kp F4    &kp F5      &kp F6    &kp F7    &kp F8     &kp F9    &kp F10
+                                  &trans    &kp C_POWER &kp CAPS  &trans
             >;
         };
 
-
-
         AOE {
             bindings = <
   &kp Q        &kp W       &kp E        &kp R        &kp T        &trans  &trans  &trans  &trans  &trans