diff --git a/config/cradio.keymap b/config/cradio.keymap
index e91e8e7..cbb6a1f 100644
--- a/config/cradio.keymap
+++ b/config/cradio.keymap
@@ -5,10 +5,6 @@
 #include <dt-bindings/zmk/keys.h>
 #include <dt-bindings/zmk/bt.h>
 
-// Home row mods macro
-#define HRML(k1,k2,k3,k4) &ht LSHFT k1  &ht LALT k2  &ht LCTRL k3  &ht LGUI k4
-#define HRMR(k1,k2,k3,k4) &ht RGUI k1  &ht RCTRL k2  &ht RALT k3  &ht RSHFT k4
-
 / {
     behaviors {
         ht: hold_tap {
@@ -91,20 +87,12 @@
         };
     };
 
-    conditional_layers {
-        compatible = "zmk,conditional-layers";
-        tri_layer {
-            if-layers = <1 2>;
-            then-layer = <3>;
-        };
-    };
-
     combos {
         compatible = "zmk,combos";
         combo_act {
             timeout-ms = <50>;
             key-positions = <14 31>;
-            bindings = <&tog act>;
+            bindings = <&tog 3>;
             layers = <default_layer>;
         };
     };
@@ -113,7 +101,7 @@
         compatible = "zmk,keymap";
         base {
             bindings = <
-            &lt sym Q  &kp W      &kp F      &kp P      &kp G          &kp J      &kp L      &kp U      &kp Y      &kp SEMI;
+            &lt 1 Q    &kp W      &kp F      &kp P      &kp G          &kp J      &kp L      &kp U      &kp Y      &kp SEMI;
             &kp A      &kp R      &kp S      &kp T      &kp D          &kp H      &kp N      &kp E      &kp I      &kp O;
             &kp Z      &kp X      &kp C      &kp V      &kp B          &kp K      &kp M      &kp COMMA  &kp DOT    &kp FSLH;
                                              &esc_shct  &kp SPACE      &kp BSPC   &kp ENTER
@@ -125,7 +113,7 @@
             &none      &kp N7     &kp N8     &kp N9         &kp N0         &kp BSLH     &kp GRAVE    &kp LBKT   &kp RBKT   &kp APOS;
             &none      &kp N4     &kp N5     &kp N6         &eq_dot        &kp HOME     &kp LEFT     &kp DOWN   &kp UP     &kp RIGHT;
             &none      &kp N1     &kp N2     &kp N3         &dash_slsh     &kp END      &kp LC(LEFT) &kp PG_DN  &kp PG_UP  &kp LC(RIGHT);
-                                             &mt LSHIFT ESC &tab_ret       &lt mnav DEL &none
+                                             &mt LSHIFT ESC &tab_ret       &lt 2 DEL    &none
             >;
         };
 
@@ -141,9 +129,9 @@
         act {
             bindings = <
             &f1_f7     &f2_f8     &f3_f9     &kp TAB     &trans            &studio_unlock     &trans     &trans       &trans       &trans;
-            &f4_f10    &f5_f11    &f6_f12    &kp LS(TAB) &tog act          &bootloader     &kp C_PREV &kp C_PP     &kp C_STOP   &kp C_NEXT;
+            &f4_f10    &f5_f11    &f6_f12    &kp LS(TAB) &tog 3            &bootloader     &kp C_PREV &kp C_PP     &kp C_STOP   &kp C_NEXT;
             &sk LCTRL  &sk LSHIFT &sk LALT   &sk LGUI    &kp PRSCRN        &trans     &kp C_MUTE &kp C_VOL_DN &kp C_VOL_UP &trans;
-                                             &trans      &tog act          &trans     &trans
+                                             &trans      &tog 3            &trans     &trans
             >;
         };
     };