diff --git a/config/swweeep.keymap b/config/swweeep.keymap
index 723d6bd..cf4b4ef 100644
--- a/config/swweeep.keymap
+++ b/config/swweeep.keymap
@@ -71,10 +71,10 @@
         default_layer {
             label = "Default";
             bindings = <
-&kp Q  &kp W  &kp E  &kp R  &kp T         &kp Y  &kp U      &kp I    &kp O     &kp P
-&kp A  &kp S  &kp D  &kp F  &kp G         &kp H  &kp K      &kp L    &kp L  &kp SEMI
-&kp Z  &kp X  &kp C  &kp V  &kp B         &kp N  &kp M  &kp COMMA  &kp DOT  &kp FSLH
-                     &kp A  &kp A  &kp A  &kp A  &kp A      &kp A
+&kp Q  &kp W  &kp E    &kp R      &kp T                   &kp Y      &kp U             &kp I    &kp O     &kp P
+&kp A  &kp S  &kp D    &kp F      &kp G                   &kp H      &kp K             &kp L    &kp L  &kp SEMI
+&kp Z  &kp X  &kp C    &kp V      &kp B                   &kp N      &kp M         &kp COMMA  &kp DOT  &kp FSLH
+                     &kp TAB  &kp SPACE  &kp ESC  &kp BACKSPACE  &kp ENTER  &kp K_PLAY_PAUSE
             >;
         };
 
@@ -95,47 +95,17 @@
             &kp EXCL          &kp AT       &trans  &kp DLLR  &kp PRCNT                 &kp CARET        &kp AMPS      &kp ASTRK  &kp LEFT_PARENTHESIS  &kp RIGHT_PARENTHESIS
             &kp PIPE  &kp UNDERSCORE    &kp MINUS  &kp PLUS  &kp EQUAL                 &kp COLON  &kp LEFT_BRACE       &kp RBRC      &kp LEFT_BRACKET      &kp RIGHT_BRACKET
 &kp NON_US_BACKSLASH          &trans  &kp AT_SIGN   &kp SQT  &kp GRAVE                 &kp TILDE        &kp HASH  &kp LESS_THAN      &kp GREATER_THAN           &kp QUESTION
-                                                     &trans     &trans  &bootloader  &bootloader          &trans      &kp LCTRL
+                                                     &trans     &trans  &bootloader  &bootloader    &out OUT_TOG      &kp LCTRL
             >;
         };
 
         func_layer {
             label = "Function";
             bindings = <
- &bootloader  &kp LS(PG_UP)    &kp LS(UP)  &kp LS(PG_DN)        &trans                &kp C_MUTE  &kp F7     &kp F8  &kp F9  &kp F10
-&kp LS(HOME)   &kp LS(LEFT)  &kp LS(DOWN)  &kp LS(RIGHT)   &kp LS(END)              &kp K_VOL_UP  &kp F4     &kp F5  &kp F6  &kp F11
-&bt BT_SEL 3   &bt BT_SEL 2  &bt BT_SEL 1   &bt BT_SEL 0    &bt BT_CLR              &kp K_VOL_DN  &kp F1     &kp F2  &kp F3  &kp F12
-                                            &out OUT_USB  &out OUT_BLE  &trans  &kp C_PLAY_PAUSE  &trans  &kp SPACE
-            >;
-        };
-
-        media_layer {
-            label = "Media";
-            bindings = <
-&trans  &trans  &trans  &trans  &trans              &trans    &bt BT_PRV    &bt BT_NXT        &trans        &trans
-&trans  &trans  &trans  &trans  &trans              &trans        &trans        &trans        &trans        &trans
-&trans  &trans  &trans  &trans  &trans          &bt BT_CLR  &bt BT_SEL 0  &bt BT_SEL 1  &bt BT_SEL 2  &bt BT_SEL 3
-                        &trans  &trans  &trans      &trans  &out OUT_BLE  &out OUT_USB
-            >;
-        };
-
-        mouse_layer {
-            label = "Mouse";
-            bindings = <
-&bootloader  &trans  &trans  &trans  &trans          &trans  &trans  &trans  &trans  &trans
-     &trans  &trans  &trans  &trans  &trans          &trans  &trans  &trans  &trans  &trans
-     &trans  &trans  &trans  &trans  &trans          &trans  &trans  &trans  &trans  &trans
-                             &trans  &trans  &trans  &trans  &trans  &trans
-            >;
-        };
-
-        winnav_layer {
-            label = "Win Navigation";
-            bindings = <
-&trans        &trans    &kp LG(UP)         &trans  &trans          &trans  &trans  &trans  &trans  &trans
-&trans  &kp LG(LEFT)  &kp LG(DOWN)  &kp LG(RIGHT)  &trans          &trans  &trans  &trans  &trans  &trans
-&trans        &trans        &trans         &trans  &trans          &trans  &trans  &trans  &trans  &trans
-                                           &trans  &trans  &trans  &trans  &trans  &trans
+&kp LG(N1)    &kp LG(N2)    &kp LG(N3)  &kp LG(N4)     &kp LG(N5)                   &kp LG(N6)     &kp LG(N7)   &kp LG(N8)  &kp LG(N9)  &kp LG(N0)
+&kp K_PREV  &kp C_VOL_UP  &kp C_VOL_UP  &kp K_NEXT  &kp C_BRI_INC                     &kp LEFT       &kp DOWN       &kp UP   &kp RIGHT   &kp ENTER
+ &kp LC(Z)     &kp LC(X)     &kp LC(C)   &kp LC(V)  &kp C_BRI_DEC                     &kp HOME  &kp PAGE_DOWN  &kp PAGE_UP     &kp END      &trans
+                                           &kp DEL     &kp INSERT  &kp PRINTSCREEN      &trans         &trans    &kp LCTRL
             >;
         };
     };