diff --git a/config/boards/shields/leko_pona/leko_pona.keymap b/config/boards/shields/leko_pona/leko_pona.keymap
index 45a6255..25c60d7 100644
--- a/config/boards/shields/leko_pona/leko_pona.keymap
+++ b/config/boards/shields/leko_pona/leko_pona.keymap
@@ -25,6 +25,7 @@ ZMK_UNICODE_PAIR(win_euro, N2, N0, A, C, N0, N0, B, N0) // euro sign and degree
 ZMK_UNICODE_PAIR(win_multi_o, A, N6, N6, E, F, F, F, D) // multiocular o
 
 
+
 #define BASE 0
 #define SYM 1
 #define NAV 2
@@ -46,41 +47,9 @@ ZMK_UNICODE_PAIR(win_multi_o, A, N6, N6, E, F, F, F, D) // multiocular o
 			then-layer = <META>;
 		};
 	};
+};
 
-	macros {
-		word_test1: word_test1 {
-			label = "Test1";
-			compatible = "zmk,behavior-macro";
-			#binding-cells = <0>;
-			wait-ms = <5>;
-			tap-ms = <5>;
-			bindings = <&macro_tap &kp T &kp O &kp K &kp I>;
-		};
-		word_test2: word_test2 {
-			label = "Test2";
-			compatible = "zmk,behavior-macro";
-			#binding-cells = <0>;
-			wait-ms = <5>;
-			tap-ms = <5>;
-			bindings = <&macro_tap &kp P &kp O &kp N &kp A>;
-		};
-	};
-
-	// home row key positions are 10 11 12 13 -- 16 17 18 19
-	combos {
-		compatible = "zmk,combos";
-		combo_toki_a {
-			key-positions = <10 11>;
-			bindings = <&word_test1>;
-			layers = <TOKI>;
-		};
-		combo_toki_b {
-			key-positions = <10 11 12>;
-			bindings = <&word_test2>;
-			layers = <TOKI>;
-		};
-	};
-
+/ {
 	behaviors {
 		esctab: shift_esc_tab {
 			compatible = "zmk,behavior-mod-morph";
@@ -103,13 +72,15 @@ ZMK_UNICODE_PAIR(win_multi_o, A, N6, N6, E, F, F, F, D) // multiocular o
 			label = "GLOBAL_QUICK_TAP";
 			#binding-cells = <2>;
 			flavor = "tap-preferred";
-			tapping-term-ms = <400>;
-			quick-tap-ms = <250>;
+			tapping-term-ms = <200>;
+			quick-tap-ms = <125>;
 			global-quick-tap;
 			bindings = <&kp>, <&kp>;
 		};
 	};
+};
 
+/ {
 	keymap {
 		compatible = "zmk,keymap";
 		l_base {
@@ -132,10 +103,10 @@ ZMK_UNICODE_PAIR(win_multi_o, A, N6, N6, E, F, F, F, D) // multiocular o
 		// F keys + navigation
 		l_nav {
 			bindings = <
-&kp F1	&kp F2	&kp F3	&kp F4	&kp F5							&kp PG_UP	&kp HOME	&kp UP		&kp END		&kp PSCRN
-&kp F6	&kp F7	&kp F8	&kp F9	&kp F10							&kp PG_DN	&kp LEFT	&kp DOWN	&kp RIGHT	&kp K_CMENU
-&trans	&kp F11	&kp F12	&kp F13	&kp F14							&kp F15		&kp F16		&kp F17		&kp F18		&trans
-						&trans	&trans	&trans			&trans	&trans		&trans
+&kp F1	&kp F2	&kp F3	&kp F4		&kp F5								&kp PG_UP	&kp HOME	&kp UP		&kp END		&kp PSCRN
+&kp F6	&kp F7	&kp F8	&kp F9		&kp F10								&kp PG_DN	&kp LEFT	&kp DOWN	&kp RIGHT	&kp K_CMENU
+&trans	&kp F11	&kp F12	&kp F13		&kp F14								&kp F15		&kp F16		&kp F17		&kp F18		&trans
+						&kp SPACE	&trans		&trans			&trans	&trans		&trans
 			>;
 		};
 		// media + bluetooth + layer toggles + numpad
@@ -147,13 +118,13 @@ ZMK_UNICODE_PAIR(win_multi_o, A, N6, N6, E, F, F, F, D) // multiocular o
 								&trans			&trans		&trans				&trans	&trans			&kp KP_ENTER
 			>;
 		};
-		// toki pona steno
+		// toki pona
 		l_toki {
 			bindings = <
-&trans	&none	&none	&none		&none							&tog TOKI	&none	&none	&none	&none
-&kp A	&kp A	&kp A	&kp A		&none							&none		&kp A	&kp A	&kp A	&kp A
-&trans	&none	&none	&none		&none							&none		&none	&none	&none	&trans
-						&kp SPACE	&trans	&trans			&none	&none		&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		&none	&trans		&none	&trans		&trans
 			>;
 		};
 		// game compatibility / half qwerty
@@ -174,7 +145,6 @@ ZMK_UNICODE_PAIR(win_multi_o, A, N6, N6, E, F, F, F, D) // multiocular o
 						&trans	&trans	&trans		&trans	&trans	&trans
 			>;
 		};
-		// unicode macros for symbol layer in windows mode
 		l_win_unicode {
 			bindings = <
 &trans	&trans	&trans	&trans	&win_euro					&win_multi_o	&win_ao	&win_ae	&win_oe	&trans