diff --git a/build.yaml b/build.yaml
index 8528c95..94aa51e 100644
--- a/build.yaml
+++ b/build.yaml
@@ -1,26 +1,8 @@
-# This file generates the GitHub Actions matrix.
-# For simple board + shield combinations, add them to the top level board and
-# shield arrays, for more control, add individual board + shield combinations
-# to the `include` property. You can also use the `cmake-args` property to
-# pass flags to the build command, `snippet` to add a Zephyr snippet, and
-# `artifact-name` to assign a name to distinguish build outputs from each other:
-#
-# board: [ "nice_nano_v2" ]
-# shield: [ "corne_left", "corne_right" ]
-# include:
-#   - board: bdn9_rev2
-#   - board: nice_nano_v2
-#     shield: reviung41
-#   - board: nice_nano_v2
-#     shield: corne_left
-#     snippet: studio-rpc-usb-uart
-#     cmake-args: -DCONFIG_ZMK_STUDIO=y
-#     artifact-name: corne_left_with_studio
-#
----
-include:
+# this is read by app/build.py to pass arguments to west
+targets:
   - board: nice_nano_v2
     shield: cradio_left
-    cmake-args: -DCONFIG_ZMK_STUDIO=y -DCONFIG_ZMK_POINTING=y
+    snippet: studio-rpc-usb-uart
+    # cmake-args: -DCONFIG_ZMK_STUDIO=y -DCONFIG_ZMK_POINTING=y
   - board: nice_nano_v2
     shield: cradio_right
diff --git a/config/cradio.conf b/config/cradio.conf
index e69de29..a2eb35a 100644
--- a/config/cradio.conf
+++ b/config/cradio.conf
@@ -0,0 +1,2 @@
+CONFIG_ZMK_STUDIO=y
+CONFIG_ZMK_POINTING=y
\ No newline at end of file
diff --git a/config/cradio.keymap b/config/cradio.keymap
index b3e8237..995dc73 100644
--- a/config/cradio.keymap
+++ b/config/cradio.keymap
@@ -8,21 +8,21 @@
 
 / {
     behaviors {
-        ht: hold_tap {
+        esc_mod: esc_mod {
+            compatible = "zmk,behavior-tap-dance";
+            #binding-cells = <0>;
+            tapping-term-ms = <200>;
+            bindings = <&kp ESC>, <&kp LCTRL>;
+        };
+
+        esc_3mod: esc_shift_ctrl {
             compatible = "zmk,behavior-hold-tap";
             #binding-cells = <2>;
             flavor = "tap-preferred";
-            tapping-term-ms = <220>;
-            quick-tap-ms = <150>;
-            require-prior-idle-ms = <100>;
-            bindings = <&kp>, <&kp>;
-        };
-        
-        esc_shct: escape_shortcut {
-            compatible = "zmk,behavior-tap-dance";
-            #binding-cells = <0>;
             tapping-term-ms = <200>;
-            bindings = <&mt LSHIFT ESC>, <&kp LCTRL>;
+            quick-tap-ms = <200>;
+            bindings = <&kp>, <&esc_mod>;
+            retro-tap;
         };
 
         eq_dot: equal_dot {
@@ -100,7 +100,7 @@
         combo_altspc {
             timeout-ms = <50>;
             key-positions = <24 31>;
-            bindings = <&kp LALT(SPACE)>;
+            bindings = <&kp LA(SPACE)>;
             layers = <0>;
         };
     };
@@ -112,7 +112,7 @@
             &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   &lt 1 ENTER
+                                             &esc_3mod LSHIFT 0  &kp SPACE      &kp BSPC   &lt 1 ENTER
             >;
         };
 
@@ -121,7 +121,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 2 DEL    &none
+                                             &mt LSHIFT ESC &tab_ret       &lt 2 DEL    &mo 2
             >;
         };
 
@@ -136,10 +136,10 @@
 
         act {
             bindings = <
-            &f1_f7     &f2_f8     &f3_f9     &kp TAB     &trans            &studio_unlock  &trans       &trans         &trans         &trans
+            &f1_f7     &f2_f8     &f3_f9     &kp TAB     &studio_unlock    &studio_unlock  &bt BT_PRV   &bt BT_NXT     &bt BT_CLR   &bt BT_CLR_ALL
             &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 PSCRN         &trans          &kp C_MUTE   &kp C_VOL_DN   &kp C_VOL_UP   &trans
-                                             &trans      &tog 3            &trans     &trans
+                                             &trans      &tog 3            &trans          &trans
             >;
         };
     };
diff --git a/out/cradio_left.uf2 b/out/cradio_left.uf2
new file mode 100644
index 0000000..b4d3de4
Binary files /dev/null and b/out/cradio_left.uf2 differ
diff --git a/out/cradio_right.uf2 b/out/cradio_right.uf2
new file mode 100644
index 0000000..fba8fdb
Binary files /dev/null and b/out/cradio_right.uf2 differ