diff --git a/funkey_gpio_mapping.conf b/funkey_gpio_mapping.conf
index 4a4d1f4..a7c62c8 100755
--- a/funkey_gpio_mapping.conf
+++ b/funkey_gpio_mapping.conf
@@ -39,9 +39,7 @@
 0, KEYBOARD, KEY_R, KEY_R, Right
 7+0, KEYBOARD, KEY_I, KEY_I, Aspect ratio factor ++
 15, KEYBOARD, KEY_N, KEY_N, R1
-# Bypass to remove when button axp working:
-7+15, KEYBOARD, KEY_Q, 7+11, Launch menu
-#7+15, KEYBOARD, KEY_O, KEY_O, R2
+7+15, KEYBOARD, KEY_O, KEY_O, R2
 2, KEYBOARD, KEY_M, KEY_M, L1
 7+2, KEYBOARD, KEY_V, KEY_V, L2
 12, KEYBOARD, KEY_B, KEY_B, B
@@ -52,8 +50,9 @@
 7+13, KEYBOARD, KEY_W, KEY_W, Brightness--
 11, KEYBOARD, KEY_Y, KEY_Y, Y
 7+11, KEYBOARD, KEY_C, KEY_C, Volume++
-10, KEYBOARD, KEY_T, KEY_T, Poweroff
-
-
+10, SHELL_COMMAND, poweroff, N_OE, Poweroff because N_OE_received
+
+# Bypass to remove when button axp working:
+#7+15, KEYBOARD, KEY_Q, 7+11, Launch menu