diff --git a/config/boards/shields/leko_pona/leko_pona.keymap b/config/boards/shields/leko_pona/leko_pona.keymap
index ef04cc0..1fa1d22 100644
--- a/config/boards/shields/leko_pona/leko_pona.keymap
+++ b/config/boards/shields/leko_pona/leko_pona.keymap
@@ -10,18 +10,19 @@ ZMK_UNICODE_PAIR(lin_ae, N0, N0, E, N4, N0, N0, C, N4)
 ZMK_UNICODE_PAIR(lin_ao, N0, N0, E, N5, N0, N0, C, N5)
 ZMK_UNICODE_PAIR(lin_oe, N0, N0, F, N6, N0, N0, D, N6)
 ZMK_UNICODE_PAIR(lin_euro, N2, N0, A, C, N0, N0, B, N0) // euro sign and degree symbol
-ZMK_UNICODE_SINGLE(multi_o, A, N6, N6, E) // multiocular o
+ZMK_UNICODE_PAIR(lin_multi_o, A, N6, N6, E, F, F, F, D) // multiocular o
 
-// switch to Windows-mode (using WinCompose) for helper script
+// switch to Windows-mode (using WinCompose)
 #undef OS_UNICODE_LEAD
 #undef OS_UNICODE_TRAIL
-#define OS_UNICODE_LEAD &macro_tap &kp RALT &kp U  // <- WinCompose sequence
-#define OS_UNICODE_TRAIL &macro_tap &kp RET  // <- Return terminates unicode input on Windows
+#define OS_UNICODE_LEAD &macro_tap &kp RALT &kp U  // WinCompose sequence
+#define OS_UNICODE_TRAIL &macro_tap &kp RET
 
 ZMK_UNICODE_PAIR(win_ae, N0, N0, E, N4, N0, N0, C, N4)
 ZMK_UNICODE_PAIR(win_ao, N0, N0, E, N5, N0, N0, C, N5)
 ZMK_UNICODE_PAIR(win_oe, N0, N0, F, N6, N0, N0, D, N6)
 ZMK_UNICODE_PAIR(win_euro, N2, N0, A, C, N0, N0, B, N0) // euro sign and degree symbol
+ZMK_UNICODE_PAIR(win_multi_o, A, N6, N6, E, F, F, F, D) // multiocular o
 
 
 
@@ -62,10 +63,10 @@ ZMK_UNICODE_PAIR(win_euro, N2, N0, A, C, N0, N0, B, N0) // euro sign and degree
 		// numbers + symbols + non english letters
 		l_sym {
 			bindings = <
-&kp TAB	&kp GRAVE	&kp LBKT	&kp RBKT	&lin_euro							&none		&lin_ao		&lin_ae		&lin_oe	&kp DEL
-&kp N1	&kp N2		&kp N3		&kp N4		&kp N5								&kp N6		&kp N7		&kp N8		&kp N9	&kp N0
-&trans	&kp SQT		&kp SLASH	&kp BSLH	&kp EQUAL							&kp MINUS	&kp SEMI	&kp COMMA	&kp DOT	&trans
-								&trans		&trans		&trans			&trans	&trans	&trans
+&kp TAB	&kp GRAVE	&kp LBKT	&kp RBKT	&lin_euro							&lin_multi_o	&lin_ao		&lin_ae		&lin_oe	&kp DEL
+&kp N1	&kp N2		&kp N3		&kp N4		&kp N5								&kp N6			&kp N7		&kp N8		&kp N9	&kp N0
+&trans	&kp SQT		&kp SLASH	&kp BSLH	&kp EQUAL							&kp MINUS		&kp SEMI	&kp COMMA	&kp DOT	&trans
+								&trans		&trans		&trans			&trans	&trans			&trans
 			>;
 //			 ' "	 / ?		 \ |		 = +									 - _		 ; :		 , <		 . >
 		};
@@ -105,6 +106,7 @@ ZMK_UNICODE_PAIR(win_euro, N2, N0, A, C, N0, N0, B, N0) // euro sign and degree
 							&kp LALT	&kp SPACE	&to BASE		&to BASE	&none	&kp RET
 			>;
 		};
+		// dummy layer for enabling windows unicod macros
 		l_windows {
 			bindings = <
 &trans	&trans	&trans	&trans	&trans						&trans	&trans	&trans	&trans	&trans
@@ -115,10 +117,10 @@ ZMK_UNICODE_PAIR(win_euro, N2, N0, A, C, N0, N0, B, N0) // euro sign and degree
 		};
 		l_win_unicode {
 			bindings = <
-&trans	&trans	&trans	&trans	&win_euro					&trans	&win_ao	&win_ae	&win_oe	&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	&win_euro					&win_multi_o	&win_ao	&win_ae	&win_oe	&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
 			>;
 		};
 	};