--- a/system/Lircmap.xml
+++ b/system/Lircmap.xml
@@ -548,50 +548,85 @@
 		<up>KEY_UP</up>
 		<down>KEY_DOWN</down>
 		<select>KEY_OK</select>
-		<enter>KEY_ENTER</enter>
+		<select>KEY_ENTER</select>
+		<select>KEY_KPENTER</select>
+		<select>KEY_SELECT</select>
 		<clear>KEY_DELETE</clear>
+		<clear>KEY_ESC</clear>
 		<start>KEY_MEDIA</start>
+		<start>KEY_HOME</start>
 		<back>KEY_EXIT</back>
+		<back>KEY_BACK</back>
+		<back>KEY_BACKSPACE</back>
+		<back>KEY_ESC</back>
+		<back>KEY_E</back>
 		<record>KEY_RECORD</record>
 		<play>KEY_PLAY</play>
+		<play>KEY_PLAYPAUSE</play>
 		<pause>KEY_PAUSE</pause>
 		<stop>KEY_STOP</stop>
+		<stop>KEY_STOPCD</stop>
 		<forward>KEY_FASTFORWARD</forward>
+		<forward>KEY_FORWARD</forward>
 		<reverse>KEY_REWIND</reverse>
 		<volumeplus>KEY_VOLUMEUP</volumeplus>
 		<volumeminus>KEY_VOLUMEDOWN</volumeminus>
 		<pageplus>KEY_CHANNELUP</pageplus>
+		<pageplus>KEY_PAGEUP</pageplus>
 		<pageminus>KEY_CHANNELDOWN</pageminus>
+		<pageminus>KEY_PAGEDOWN</pageminus>
 		<skipplus>KEY_NEXT</skipplus>
+		<skipplus>KEY_NEXTSONG</skipplus>
 		<skipminus>KEY_PREVIOUS</skipminus>
+		<skipminus>KEY_PREVIOUSSONG</skipminus>
 		<guide>KEY_EPG</guide>
 		<title>KEY_TITLE</title>
+		<title>KEY_TV2</title>
+		<title>KEY_CONTEXT_MENU</title>
 		<subtitle>KEY_SUBTITLE</subtitle>
 		<language>KEY_LANGUAGE</language>
 		<info>KEY_INFO</info>
+		<info>KEY_PROPS</info>
 		<display>KEY_ZOOM</display>
+		<display>KEY_ANGLE</display>
 		<mute>KEY_MUTE</mute>
 		<power>KEY_POWER</power>
+		<power>KEY_SLEEP</power>
+		<power>KEY_WAKEUP</power>
 		<eject>KEY_EJECTCD</eject>
 		<eject>KEY_EJECTCLOSECD</eject>
 		<menu>KEY_DVD</menu>
 		<menu>KEY_MENU</menu>
 		<myvideo>KEY_VIDEO</myvideo>
 		<mymusic>KEY_AUDIO</mymusic>
+		<mymusic>KEY_MP3</mymusic>
 		<mypictures>KEY_CAMERA</mypictures>
+		<mypictures>KEY_IMAGES</mypictures>
 		<livetv>KEY_TUNER</livetv>
 		<mytv>KEY_TV</mytv>
+		<mytv>KEY_PVR</mytv>
 		<teletext>KEY_TEXT</teletext>
+		<one>KEY_1</one>
 		<one>KEY_NUMERIC_1</one>
+		<two>KEY_2</two>
 		<two>KEY_NUMERIC_2</two>
+		<three>KEY_3</three>
 		<three>KEY_NUMERIC_3</three>
+		<four>KEY_4</four>
 		<four>KEY_NUMERIC_4</four>
+		<five>KEY_5</five>
 		<five>KEY_NUMERIC_5</five>
+		<six>KEY_6</six>
 		<six>KEY_NUMERIC_6</six>
+		<seven>KEY_7</seven>
 		<seven>KEY_NUMERIC_7</seven>
+		<eight>KEY_8</eight>
 		<eight>KEY_NUMERIC_8</eight>
+		<nine>KEY_9</nine>
 		<nine>KEY_NUMERIC_9</nine>
+		<zero>KEY_0</zero>
 		<zero>KEY_NUMERIC_0</zero>
+		<star>KEY_KPASTERISK</star>
 		<star>KEY_NUMERIC_STAR</star>
 		<hash>KEY_NUMERIC_POUND</hash>
 		<red>KEY_RED</red>