--- usb-xboxir.h	2004-06-05 15:24:32.000000000 -0400
+++ usb-xboxir.h_ken	2004-06-05 15:30:05.000000000 -0400
@@ -69,34 +69,57 @@
 	unsigned char	rc_code;
 	unsigned int	kbd_code;
 } rc_kbd_matrix[] = {
-	{ RC_KEY_SELECT,	KEY_ENTER },
-	{ RC_KEY_UP,			KEY_UP },
-	{ RC_KEY_DOWN,		KEY_DOWN },
-	{ RC_KEY_RIGHT,		KEY_RIGHT },
-	{ RC_KEY_LEFT,		KEY_LEFT },
-	{ RC_KEY_INFO,		KEY_HELP },
-	{ RC_KEY_9,				KEY_9 },
-	{ RC_KEY_8,				KEY_8 },
-	{ RC_KEY_7,				KEY_7 },
-	{ RC_KEY_6,				KEY_6 },
-	{ RC_KEY_5,				KEY_5 },
-	{ RC_KEY_4,				KEY_4 },
-	{ RC_KEY_3,				KEY_3 },
-	{ RC_KEY_2,				KEY_2 },
-	{ RC_KEY_1,				KEY_1 },
-	{ RC_KEY_0,				KEY_0 },
-	{ RC_KEY_DISPLAY,	KEY_HELP },
-	{ RC_KEY_BACK,		KEY_BACK },
-	{ RC_KEY_SKIPF,		KEY_PREVIOUSSONG },
-	{ RC_KEY_SKIPB,		KEY_NEXTSONG },
-	{ RC_KEY_STOP,		KEY_STOPCD },
-	{ RC_KEY_REW,			KEY_REWIND },
-	{ RC_KEY_FWD,			KEY_FORWARD },
-	{ RC_KEY_TITLE,		KEY_MENU },
-	{ RC_KEY_PAUSE,		KEY_PAUSECD },
-	{ RC_KEY_PLAY,		KEY_PLAYCD },
-	{ RC_KEY_MENU,		KEY_MENU },
-	{ 0,0 }
+        { RC_KEY_SELECT,        KEY_ENTER },
+        { RC_KEY_UP,            KEY_UP },
+        { RC_KEY_DOWN,          KEY_DOWN },
+        { RC_KEY_RIGHT,         KEY_RIGHT },
+        { RC_KEY_LEFT,          KEY_LEFT },
+
+        /*
+         * O is browse mode for live tv
+         * and info menu in recordings
+         */
+        { RC_KEY_INFO,          KEY_O },
+
+        { RC_KEY_9,             KEY_9 },
+        { RC_KEY_8,             KEY_8 },
+        { RC_KEY_7,             KEY_7 },
+        { RC_KEY_6,             KEY_6 },
+        { RC_KEY_5,             KEY_5 },
+        { RC_KEY_4,             KEY_4 },
+        { RC_KEY_3,             KEY_3 },
+        { RC_KEY_2,             KEY_2 },
+        { RC_KEY_1,             KEY_1 },
+        { RC_KEY_0,             KEY_0 },
+
+	/* 
+	 * Don't have a usefull mapping for display that 
+	 * would be original, just use I so it's bring 
+	 * up OSD in live-tv. Any suggestions are welcome!
+	 */
+	 
+        { RC_KEY_DISPLAY,       KEY_I },
+        { RC_KEY_BACK,          KEY_ESC },
+
+        /* Z is next commercial marker */
+        { RC_KEY_SKIPF,         KEY_Z },
+
+        /* Q is previous commercial marker */
+        { RC_KEY_SKIPB,         KEY_Q},
+        
+	/* O will stop music in mythmusic */
+        { RC_KEY_STOP,          KEY_O},
+        { RC_KEY_REW,           KEY_L},
+        { RC_KEY_FWD,           KEY_R },
+        
+	/* I will bring up osd in live-tv */
+        { RC_KEY_TITLE,         KEY_I },
+        { RC_KEY_PAUSE,         KEY_P },
+        { RC_KEY_PLAY,          KEY_P },
+        
+	/* M will bring up electronic program guide (EPG) in live tv */
+        { RC_KEY_MENU,          KEY_M },
+        { 0,0 }
 };
 
 struct usb_xboxir {