diff --git a/config/cradio.keymap b/config/cradio.keymap
index e98e1e7..29d989e 100644
--- a/config/cradio.keymap
+++ b/config/cradio.keymap
@@ -7,31 +7,30 @@
     combos {
         compatible = "zmk,combos";
 
-        switch_to_qwerty {
-            bindings = <&to 5>;
+        tog_qwerty {
+            bindings = <&tog 5>;
             key-positions = <10 14>;
             require-prior-idle-ms = <2000>;
-            layers = <0>;
+            layers = <0 5>;
         };
 
-        switch_to_dvorak {
-            bindings = <&to 0>;
-            key-positions = <14 10>;
-            require-prior-idle-ms = <2000>;
-            layers = <5>;
-        };
-
-        to_navigation {
-            bindings = <&to 3>;
+        tog_navigation {
+            bindings = <&tog 3>;
             key-positions = <16 17>;
             require-prior-idle-ms = <500>;
         };
 
-        to_numpad {
-            bindings = <&to 4>;
+        tog_numpad {
+            bindings = <&tog 4>;
             key-positions = <17 18>;
             require-prior-idle-ms = <500>;
         };
+
+        tog_gaming {
+            bindings = <&tog 6>;
+            key-positions = <4 0>;
+            require-prior-idle-ms = <500>;
+        };
     };
 
     keymap {
@@ -39,10 +38,10 @@
 
         dvorak {
             bindings = <
-&kp SEMI        &kp COMMA         &kp DOT             &kp P                    &kp Y      &kp F        &kp G                &kp C                &kp R              &kp L
-&mt LEFT_ALT A  &mt LEFT_SHIFT O  &mt LEFT_CONTROL E  &mt LEFT_META U          &kp I      &kp D        &mt RIGHT_META H     &mt RIGHT_CONTROL T  &mt RIGHT_SHIFT N  &mt RIGHT_ALT S
-&kp SQT         &kp Q             &kp J               &kp K                    &kp X      &kp B        &kp M                &kp W                &kp V              &kp Z
-                                                      &kp ESCAPE  &kp TAB    &lt 1 SPACE  &kp ENTER
+&kp SEMI        &kp COMMA         &kp DOT             &kp P            &kp Y      &kp F        &kp G             &kp C                &kp R              &kp L
+&mt LEFT_ALT A  &mt LEFT_SHIFT O  &mt LEFT_CONTROL E  &mt LEFT_META U  &kp I      &kp D        &mt RIGHT_META H  &mt RIGHT_CONTROL T  &mt RIGHT_SHIFT N  &mt RIGHT_ALT S
+&kp SQT         &kp Q             &kp J               &kp K            &kp X      &kp B        &kp M             &kp W                &kp V              &kp Z
+                                                      &kp ESCAPE       &kp TAB    &lt 1 SPACE  &kp ENTER
             >;
 
             label = "dvorak";
@@ -50,10 +49,10 @@
 
         symbols {
             bindings = <
-&kp N7    &kp N5          &kp N3    &kp N1    &kp N9       &kp N0    &kp N2     &kp N4    &kp N6           &kp N8
-&kp LBKT  &kp LEFT_BRACE  &kp RBRC  &kp LPAR  &kp EQUAL    &kp STAR  &kp RPAR   &kp PLUS  &kp RIGHT_BRACE  &kp EXCL
-&kp DLLR  &kp AMPS        &kp BSLH  &kp PLUS  &kp AT       &kp HASH  &kp MINUS  &kp FSLH  &kp UNDERSCORE   &kp CARET
-                                    &kp BACKSPACE    &kp DELETE       &trans    &trans
+&kp N7    &kp N5          &kp N3    &kp N1         &kp N9        &kp N0    &kp N2     &kp N4    &kp N6           &kp N8
+&kp LBKT  &kp LEFT_BRACE  &kp RBRC  &kp LPAR       &kp EQUAL     &kp STAR  &kp RPAR   &kp PLUS  &kp RIGHT_BRACE  &kp EXCL
+&kp DLLR  &kp AMPS        &kp BSLH  &kp PLUS       &kp AT        &kp HASH  &kp MINUS  &kp FSLH  &kp UNDERSCORE   &kp CARET
+                                    &kp BACKSPACE  &kp DELETE    &trans    &trans
             >;
 
             label = "symbols";
@@ -94,11 +93,22 @@
 
         qwerty {
             bindings = <
-&kp Q            &kp W             &kp E               &kp R                    &kp T      &kp Y        &kp U                &kp I                &kp O              &kp P
-&mt LEFT_META A  &mt LEFT_SHIFT S  &mt LEFT_CONTROL D  &mt LEFT_ALT F           &kp G      &kp H        &mt RIGHT_ALT J      &mt RIGHT_CONTROL K  &mt RIGHT_SHIFT L  &mt RIGHT_META SEMI
-&kp Z            &kp X             &kp C               &kp V                    &kp B      &kp N        &kp M                &kp COMMA            &kp DOT            &kp FSLH
-                                                       &kp ESCAPE  &kp TAB    &lt 1 SPACE  &kp ENTER
+&kp Q            &kp W             &kp E               &kp R           &kp T      &kp Y        &kp U            &kp I                &kp O              &kp P
+&mt LEFT_META A  &mt LEFT_SHIFT S  &mt LEFT_CONTROL D  &mt LEFT_ALT F  &kp G      &kp H        &mt RIGHT_ALT J  &mt RIGHT_CONTROL K  &mt RIGHT_SHIFT L  &mt RIGHT_META SEMI
+&kp Z            &kp X             &kp C               &kp V           &kp B      &kp N        &kp M            &kp COMMA            &kp DOT            &kp FSLH
+                                                       &kp ESCAPE      &kp TAB    &lt 1 SPACE  &kp ENTER
             >;
         };
+
+        gaming {
+            bindings = <
+&kp ESC    &kp Q  &kp W  &kp E     &kp R        &trans  &trans  &trans  &trans  &trans
+&kp LSHFT  &kp A  &kp S  &kp D     &kp F        &trans  &trans  &trans  &trans  &trans
+&kp LCTRL  &kp Z  &kp X  &kp C     &kp V        &trans  &trans  &trans  &trans  &trans
+                         &kp LALT  &kp SPACE    &trans  &trans
+            >;
+
+            label = "gaming";
+        };
     };
 };