diff --git a/config/boards/shields/leko_pona/leko_pona.keymap b/config/boards/shields/leko_pona/leko_pona.keymap
index 3e9024d..4cbd0c4 100644
--- a/config/boards/shields/leko_pona/leko_pona.keymap
+++ b/config/boards/shields/leko_pona/leko_pona.keymap
@@ -79,22 +79,22 @@ ZMK_UNICODE_PAIR(win_multi_o, A, N6, N6, E, F, F, F, D) // multiocular o
 						&trans	&trans		&trans			&trans	&trans		&trans
 			>;
 		};
-		// media + bluetooth + future layer toggles
+		// media + bluetooth + layer toggles + numpad
 		l_meta {
 			bindings = <
-&none	&none	&tog WINDOWS	&tog GAME	&tog TOKI					&kp C_BRI_UP	&kp C_PREV	&kp C_NEXT	&kp C_VOL_UP	&none
-&none	&none	&none			&none		&none						&kp C_BRI_DN	&kp C_PLAY	&kp C_STOP	&kp C_VOL_DN	&none
-&none	&none	&bt BT_SEL 0	&bt BT_NXT	&bt BT_CLR					&none			&none		&none		&none			&none
-								&trans		&trans	&trans		&trans	&trans	&trans
+&kp C_VOL_UP	&kp C_VOL_DN	&tog WINDOWS	&tog GAME	&tog TOKI					&kp KP_MULTIPLY	&kp KP_N7	&kp KP_N8	&kp KP_N9	&kp KP_PLUS
+&kp C_PREV		&kp C_NEXT		&none			&kp C_PLAY	&none						&kp KP_DIVIDE	&kp KP_N4	&kp KP_N5	&kp KP_N6	&kp KP_N0
+&trans			&none			&bt BT_SEL 0	&bt BT_NXT	&bt BT_CLR					&kp KP_DOT		&kp KP_N1	&kp KP_N2	&kp KP_N3	&kp KP_MINUS
+								&trans			&trans		&trans				&trans	&trans	&kp KP_ENTER
 			>;
 		};
 		// toki pona
 		l_toki {
 			bindings = <
-&trans	&kp P	&kp W		&kp U		&none						&to BASE	&kp E	&kp S		&kp J	&trans
+&trans	&kp P	&kp W		&kp U		&none						&tog TOKI	&kp E	&kp S		&kp J	&trans
 &kp N	&kp L	&kp I		&kp A		&none						&none		&kp O	&kp T		&kp M	&kp K
 &trans	&none	&kp QMARK	&kp EXCL	&none						&none		&kp DOT	&kp COMMA	&none	&none
-							&trans		&trans	&none		&none	&trans		&trans
+							&trans		&none	&trans		&none	&trans		&trans
 			>;
 		};
 		// game compatibility / half qwerty
@@ -103,7 +103,7 @@ ZMK_UNICODE_PAIR(win_multi_o, A, N6, N6, E, F, F, F, D) // multiocular o
 &kp ESC		&kp Q	&kp W	&kp E		&kp R									&none	&none		&kp UP		&none		&kp BSPC
 &kp LSHFT	&kp A	&kp S	&kp D		&kp F									&none	&kp LEFT	&kp DOWN	&kp RIGHT	&none
 &kp LCTRL	&kp Z	&kp X	&kp C		&kp V									&none	&none		&none		&none		&none
-							&kp LALT	&kp SPACE	&to BASE		&to BASE	&none	&kp RET
+							&kp LALT	&kp SPACE	&tog GAME		&tog GAME	&none	&kp RET
 			>;
 		};
 		// dummy layer for enabling windows unicod macros
diff --git a/layout.png b/layout.png
index 718effa..94591df 100644
Binary files a/layout.png and b/layout.png differ
diff --git a/layout.txt b/layout.txt
index 2664934..631e9b4 100644
--- a/layout.txt
+++ b/layout.txt
@@ -13,8 +13,8 @@
 [{f:6},"F6","F7","F8","F9","F10",{x:4,f:4},"PgDn",{f:6},"←","↓","→",{f:4},"Menu"],
 [{f:6},"Ctrl","F11","F12","F13","F14",{x:4},"F15","F16","F17","F18","Alt"],
 [{x:3,f:4},"Space","L3","Super",{x:2,g:true,f:1},"",{g:false,f:4},"Shift","Enter"],
-[{y:1,f:9,w:14,d:true},"meta layer"],
-[{f:4},"","","Win/ Linux","Game","toki pona",{x:4},"Bright+","Prev","Next","Vol+",""],
-[{f:6},"","","","","",{x:4,f:4},"Bright-","Play","Stop","Vol-",""],
-["","","BT-0","BT-next","BT-clear",{x:4},"","","","",""],
-[{x:3},"Space",{g:true},"",{g:false},"Super",{x:2,g:true},"",{g:false},"Shift","Enter"]
+[{y:1,f:9,w:14,d:true},"meta + numpad layer"],
+[{f:4},"Vol-","Vol+","Win/ Linux","Game","toki pona",{x:4,f:6},"*","7","8","9","+"],
+[{f:4},"Prev","Next","","Play Pause","",{x:4,f:6},"/","4","5","6","0"],
+[{f:4},"Ctrl","","BT-0","BT-next","BT-clear",{x:4,f:6},".","1","2","3","-"],
+[{x:3,f:4},"Space",{g:true},"",{g:false},"Super",{x:2,g:true},"",{g:false},"Shift","Num Enter"]
\ No newline at end of file