Index: /ipk/source/keymaps_IPBOX_900_910_9000_neutrino_1_3/var/usr/local/share/enigma2/keymap.xml
===================================================================
--- /ipk/source/keymaps_IPBOX_900_910_9000_neutrino_1_3/var/usr/local/share/enigma2/keymap.xml	(revision 10826)
+++ /ipk/source/keymaps_IPBOX_900_910_9000_neutrino_1_3/var/usr/local/share/enigma2/keymap.xml	(revision 10827)
@@ -1,25 +1,13 @@
 <keymap>
 	<map context="ListboxActions">
-		<key id="KEY_FP_UP" mapto="moveUp" flags="mr" />
-		<key id="KEY_FP_DOWN" mapto="moveDown" flags="mr" />
-		<key id="KEY_FP_UP" mapto="moveTop" flags="l" />
-		<key id="KEY_FP_DOWN" mapto="moveEnd" flags="l" />
-		<key id="KEY_FP_LEFT" mapto="pageUp" flags="mr" />
-		<key id="KEY_FP_RIGHT" mapto="pageDown" flags="mr" />
 		<key id="KEY_UP" mapto="moveUp" flags="mr" />
 		<key id="KEY_DOWN" mapto="moveDown" flags="mr" />
-		<key id="KEY_HOME" mapto="moveTop" flags="mr" />
-		<key id="KEY_END" mapto="moveEnd" flags="mr" />
-		<key id="KEY_PAGEUP" mapto="pageUp" flags="mr" />
-		<key id="KEY_PAGEDOWN" mapto="pageDown" flags="mr" />
-		<key id="1" mapto="moveUp" flags="mr" />
-		<key id="2" mapto="moveDown" flags="mr" />
+		<key id="KEY_CHANNELUP" mapto="pageUp" flags="m" />
+		<key id="KEY_CHANNELDOWN" mapto="pageDown" flags="m" />
 	</map>
 
   	<map context="SetupActions">
-		<key id="KEY_ENTER" mapto="ok" flags="m" />
-		<key id="KEY_OK" mapto="ok" flags="m" />
-		<key id="KEY_EXIT" mapto="cancel" flags="m" />
-		<key id="KEY_ESC" mapto="cancel" flags="m" />
+		<key id="KEY_OK" mapto="ok" flags="m" />
+		<key id="KEY_HOME" mapto="cancel" flags="m" />
 		<key id="KEY_LEFT" mapto="left" flags="mr" />
 		<key id="KEY_RIGHT" mapto="right" flags="mr" />
@@ -36,8 +24,4 @@
 		<key id="KEY_9" mapto="9" flags="m" />
 		<key id="KEY_0" mapto="0" flags="m" />
-    	<key id="KEY_FP_OK" mapto="ok" flags="m" />
-		<key id="KEY_FP_BACK" mapto="cancel" flags="m" />
-		<key id="KEY_FP_LEFT" mapto="left" flags="mr" />
-		<key id="KEY_FP_RIGHT" mapto="right" flags="mr" />
 		<key id="KEY_FORWARD" mapto="deleteForward" flags="mr" />
 		<key id="KEY_BACK" mapto="deleteBackward" flags="mr" />
@@ -57,14 +41,10 @@
 		<key id="KEY_9" mapto="9" flags="m" />
 		<key id="KEY_0" mapto="0" flags="m" />
-	  	<key id="KEY_FP_LEFT" mapto="left" flags="mr" />
-		<key id="KEY_FP_RIGHT" mapto="right" flags="mr" />
  	</map>
 
 	<map context="InfobarEPGActions">
 		<key id="KEY_EPG" mapto="showEventInfoPlugin" flags="m" />
-		<key id="KEY_F5" mapto="showEventInfo" flags="m"/>
+		<key id="KEY_BOOKMARKS" mapto="showEventInfo" flags="m"/>
 		<key id="KEY_INFO" mapto="showEventInfo" flags="l"/>
-
-		<!--key id="KEY_HELP" mapto="showEventInfoPlugin" flags="m" /-->
 	</map>
 
@@ -82,6 +62,4 @@
 		<key id="KEY_9" mapto="9" flags="m" />
 		<key id="KEY_0" mapto="0" flags="m" />
-	 	<key id="KEY_FP_LEFT" mapto="left" flags="mr" />
-		<key id="KEY_FP_RIGHT" mapto="right" flags="mr" />
 	</map>
 
@@ -91,9 +69,4 @@
 
  	<map context="InfobarChannelSelection">
-	    <key id="KEY_FP_UP" mapto="zapDown" flags="m" />
-		<key id="KEY_FP_DOWN" mapto="zapUp" flags="m" />
-		<key id="KEY_FP_LEFT" mapto="volumeDown" flags="mr" />
-		<key id="KEY_FP_RIGHT" mapto="volumeUp" flags="mr" />
-		<key id="KEY_FP_OK" mapto="openServiceList" flags="m" />
 		<key id="KEY_LEFT" mapto="historyBack" flags="mr" />
 		<key id="KEY_RIGHT" mapto="historyNext" flags="mr" />
@@ -101,15 +74,9 @@
 		<key id="KEY_DOWN" mapto="zapUp" flags="mr" />
 		<key id="KEY_PREVIOUS" mapto="zapDown" flags="mr" />
-		<key id="KEY_NEXT" mapto="zapUp" flags="mr" />
-		<key id="KEY_BACK" mapto="historyBack" flags="mr" />
-		<key id="KEY_FORWARD" mapto="historyNext" flags="mr" />
-		<key id="KEY_PAGEUP" mapto="zapDown" flags="m" />
-		<key id="KEY_PAGEDOWN" mapto="zapUp" flags="m" />
+		<key id="KEY_CHANNELDOWN" mapto="zapUp" flags="m" />
+		<key id="KEY_CHANNELUP" mapto="zapDown" flags="m" />
 		<key id="KEY_OK" mapto="openServiceList" flags="m" />
-		<key id="BTN_0" mapto="zapUp" flags="m" />
-		<key id="BTN_1" mapto="zapDown" flags="m" />
 		<key id="KEY_FAVORITES" mapto="openServiceList" flags="m" />
 		<key id="KEY_FAVORITES" mapto="showFavourites" flags="l" />
-		<key id="KEY_ANGLE" mapto="subtitle" flags="m" />
 	</map>
 
@@ -118,16 +85,10 @@
 		<key id="KEY_DOWN" mapto="down" flags="mr" />
 		<key id="KEY_OK" mapto="ok" flags="m" />
-		<key id="KEY_ENTER" mapto="ok" flags="m" />
-		<key id="KEY_EXIT" mapto="cancel" flags="m" />
-		<key id="KEY_ESC" mapto="cancel" flags="m" />
-	  	<key id="KEY_FP_UP" mapto="up" flags="mr" />
-		<key id="KEY_FP_DOWN" mapto="down" flags="mr" />
-		<key id="KEY_FP_OK" mapto="ok" flags="m" />
-		<key id="KEY_FP_BACK" mapto="cancel" flags="m" />
+		<key id="KEY_HOME" mapto="cancel" flags="m" />
   	</map>
 
 	<map context="InputAsciiActions">
 		<device name="Console">
-			<key id="KEY_ASCII" mapto="gotAsciiCode" flags="mr" />
+  <key id="KEY_ASCII" mapto="gotAsciiCode" flags="mr" />
 		</device>
 	</map>
@@ -137,11 +98,5 @@
 		<key id="KEY_RIGHT" mapto="right" flags="mr" />
 		<key id="KEY_OK" mapto="ok" flags="m" />
-		<key id="KEY_ENTER" mapto="ok" flags="m" />
-		<key id="KEY_EXIT" mapto="back" flags="m" />
-		<key id="KEY_ESC" mapto="back" flags="m" />
-		<key id="KEY_FP_LEFT" mapto="left" flags="mr" />
-		<key id="KEY_FP_RIGHT" mapto="right" flags="mr" />
-		<key id="KEY_FP_OK" mapto="ok" flags="m" />
-		<key id="KEY_FP_BACK" mapto="back" flags="m" />
+		<key id="KEY_HOME" mapto="back" flags="m" />
 	</map>
 
@@ -152,7 +107,5 @@
 		<key id="KEY_DOWN" mapto="down" flags="mr" />
 		<key id="KEY_OK" mapto="ok" flags="m" />
-		<key id="KEY_ENTER" mapto="ok" flags="m" />
-		<key id="KEY_EXIT" mapto="back" flags="m" />
-		<key id="KEY_ESC" mapto="back" flags="m" />
+		<key id="KEY_HOME" mapto="back" flags="m" />
    		<key id="KEY_1" mapto="1" flags="m" />
 		<key id="KEY_2" mapto="2" flags="m" />
@@ -165,43 +118,30 @@
 		<key id="KEY_9" mapto="9" flags="m" />
 		<key id="KEY_0" mapto="0" flags="m" />
-    	<key id="KEY_FP_LEFT" mapto="left" flags="mr" />
-		<key id="KEY_FP_RIGHT" mapto="right" flags="mr" />
-		<key id="KEY_FP_UP" mapto="up" flags="mr" />
-		<key id="KEY_FP_DOWN" mapto="down" flags="mr" />
-		<key id="KEY_FP_OK" mapto="ok" flags="m" />
-		<key id="KEY_FP_BACK" mapto="back" flags="m" />
  	</map>
 
 	<map context="InfobarMenuActions">
 		<key id="KEY_MENU" mapto="mainMenu" flags="mr" />
-		<key id="KEY_FP_MENU" mapto="mainMenu" flags="mr" />
   	</map>
 
 		<map context="MenuActions">
 		<key id="KEY_MENU" mapto="menu" flags="mr" />
-	  	<key id="KEY_FP_MENU" mapto="menu" flags="mr" />
  	</map>
 
 	<map context="InfobarShowHideActions">
 		<key id="KEY_INFO" mapto="toggleShow" flags="b" />
-		<key id="KEY_ENTER" mapto="toggleShow" flags="m" />
-		<key id="KEY_EXIT" mapto="hide" flags="m" />
-		<key id="KEY_ESC" mapto="hide" flags="m" />
+		<key id="KEY_HOME" mapto="hide" flags="m" />
 		<key id="KEY_FAVORITES" mapto="showFavourites" flags="m" />
-		<key id="KEY_FP_BACK" mapto="hide" flags="m" />
   	</map>
 
 	<map context="InfobarActions">
-		<key id="KEY_FILE" mapto="showMovies" flags="m" />
+		<key id="KEY_MEDIA" mapto="showMovies" flags="m" />
 		<key id="KEY_BLUE" mapto="toogleTvRadio" flags="m" />
 		<key id="KEY_RADIO" mapto="showRadio" flags="m" />
-		<key id="KEY_TV" mapto="showTv" flags="m" />
+		<key id="KEY_WWW" mapto="showTv" flags="m" />
    		<!--key id="KEY_BLUE" mapto="showTv" flags="m" /-->
 	</map>
 
 	<map context="TvRadioActions">
-		<key id="KEY_0" mapto="keyTV" flags="m" />
 		<key id="KEY_TEXT" mapto="keyRadio" flags="m" />
-		<key id="KEY_TV" mapto="keyTV" flags="m" />
 		<key id="KEY_RADIO" mapto="keyRadio" flags="m" />
 	</map>
@@ -213,6 +153,5 @@
  		<map context="InfobarAudioSelectionActions">
 		<key id="KEY_GREEN" mapto="audioSelection" flags="m" />
-		<key id="KEY_F3" mapto="audioSelection" flags="m" />
-		<key id="BTN_0" mapto="audioSelection" flags="m" />
+		<key id="KEY_AUDIO" mapto="audioSelection" flags="m" />
 	</map>
 
@@ -224,32 +163,25 @@
 	<map context="InfobarSubserviceSelectionActions">
 		<key id="KEY_YELLOW" mapto="subserviceSelection" flags="m" />
-		<key id="KEY_LANG3" mapto="subserviceSelection" flags="m" />
+		<key id="KEY_F3" mapto="subserviceSelection" flags="m" />
 	</map>
 
 	<map context="InfobarSubserviceQuickzapActions">
-		<key id="KEY_PREVIOUS" mapto="prevSubservice" flags="m" />
-		<key id="KEY_NEXT" mapto="nextSubservice" flags="m" />
-		<key id="KEY_BACK" mapto="prevSubservice" flags="m" />
-		<key id="KEY_FORWARD" mapto="nextSubservice" flags="m" />
-		<key id="KEY_EXIT" mapto="exit" flags="m" />
-		<key id="KEY_ESC" mapto="exit" flags="m" />
-		<key id="KEY_FP_BACK" mapto="exit" flags="m" />
-		<!--key id="KEY_FP_POWER" mapto="power_long" flags="l" />
-		<key id="KEY_FP_POWER" mapto="power_down" flags="m" />
-		<key id="KEY_FP_POWER" mapto="power_up" flags="b" /-->
+		<key id="KEY_LEFT" mapto="prevSubservice" flags="m" />
+		<key id="KEY_RIGHT" mapto="nextSubservice" flags="m" />
+		<key id="KEY_HOME" mapto="exit" flags="m" />
 	</map>
 
 	<map context="GlobalActions">
-	    <key id="KEY_FP_LEFT" mapto="volumeDown" flags="mr" />
-		<key id="KEY_FP_RIGHT" mapto="volumeUp" flags="mr" />
-		<key id="KEY_FP_POWER" mapto="power_long" flags="mr" />
 		<key id="KEY_VOLUMEUP" mapto="volumeUp" flags="mr" />
 		<key id="KEY_VOLUMEDOWN" mapto="volumeDown" flags="mr" />
 		<key id="KEY_MUTE" mapto="volumeMute" flags="mr" />
-		<key id="KEY_POWER" mapto="power_long" flags="m" />
+		<key id="KEY_POWER" mapto="power_long" flags="l" />
+		<key id="KEY_POWER" mapto="power_down" flags="m" />
+		<key id="KEY_POWER" mapto="power_up" flags="b" />
 	</map>
 
 	<map context="PowerKeyActions">
 		<key id="KEY_POWER" mapto="powerdown" flags="m" />
+		<key id="KEY_POWER" mapto="powerup" flags="b" />
 	</map>
 
@@ -265,11 +197,10 @@
 		<key id="KEY_9" mapto="9" flags="m" />
 		<key id="KEY_0" mapto="0" flags="m" />
-		<key id="KEY_F2" mapto="0" flags="m" />
+		<key id="KEY_PREVIOUS" mapto="0" flags="m" />
 	</map>
 
 	<map context="TextEntryActions">
-		<key id="KEY_MUTE" mapto="deleteForward" flags="mr" />
-		<key id="KEY_NEXT" mapto="deleteForward" flags="mr" />
-		<key id="KEY_PREVIOUS" mapto="deleteBackward" flags="mr" />
+		<key id="KEY_RIGHT" mapto="deleteForward" flags="mr" />
+		<key id="KEY_LEFT" mapto="deleteBackward" flags="mr" />
 	</map>
 
@@ -281,7 +212,4 @@
 		<key id="KEY_REWIND" mapto="seekBackManual" flags="l" />
 		<key id="KEY_FASTFORWARD" mapto="seekFwdManual" flags="l" />
-		<key id="KEY_FP_LEFT" mapto="seekBack" flags="m" />
-		<key id="KEY_FP_RIGHT" mapto="seekFwd" flags="m" />
-		<key id="KEY_FP_OK" mapto="unPauseService" flags="m" />
 		<key id="KEY_LEFT" mapto="seekBack" flags="m" />
 		<key id="KEY_RIGHT" mapto="seekFwd" flags="m" />
@@ -321,5 +249,4 @@
 		<key id="KEY_MENU" mapto="contextMenu" flags="m" />
 		<key id="KEY_INFO" mapto="showEventInfo" flags="m" />
-    	<key id="KEY_FP_MENU" mapto="contextMenu" flags="m" />
 	</map>
 
@@ -327,19 +254,9 @@
 		<key id="KEY_UP" mapto="up" flags="m" />
 		<key id="KEY_DOWN" mapto="down" flags="m" />
-		<key id="KEY_VIDEO" mapto="movieList" flags="m" />
-		<key id="KEY_FP_FILE" mapto="movieList" flags="m" />
-		<key id="KEY_FP_UP" mapto="up" flags="m" />
-		<key id="KEY_FP_DOWN" mapto="down" flags="m" />
-	</map>
-
-
-
-
+	</map>
 
 	<map context="MoviePlayerActions">
-		<key id="KEY_WWW" mapto="leavePlayer" flags="m" />
-		<key id="KEY_EXIT" mapto="leavePlayer" flags="m" />
+		<key id="KEY_HOME" mapto="leavePlayer" flags="m" />
 		<key id="KEY_STOP" mapto="leavePlayer" flags="m" />
-		<key id="KEY_FP_BACK" mapto="leavePlayer" flags="m" />
 	</map>
 
@@ -367,10 +284,5 @@
 		<key id="KEY_UP" mapto="prevPage" flags="mr" />
 		<key id="KEY_DOWN" mapto="nextPage" flags="mr" />
-		<key id="KEY_EXIT" mapto="exit" flags="m" />
-		<key id="KEY_FP_LEFT" mapto="prevSubPage" flags="mr" />
-		<key id="KEY_FP_RIGHT" mapto="nextSubPage" flags="mr" />
-		<key id="KEY_FP_UP" mapto="prevPage" flags="mr" />
-		<key id="KEY_FP_DOWN" mapto="nextPage" flags="mr" />
-		<key id="KEY_FP_BACK" mapto="exit" flags="m" />
+		<key id="KEY_HOME" mapto="exit" flags="m" />
 	</map>
 
@@ -380,18 +292,14 @@
 		<key id="KEY_YELLOW" mapto="showProviders" flags="m" />
 		<key id="KEY_BLUE" mapto="showFavourites" flags="m" />
-		<key id="KEY_CHANNELUP" mapto="nextBouquet" flags="m" />
-		<key id="KEY_CHANNELDOWN" mapto="prevBouquet" flags="m" />
-		<key id="KEY_PREVIOUS" mapto="prevMarker" flags="m" />
-		<key id="KEY_NEXT" mapto="nextMarker" flags="m" />
-		<key id="KEY_BACK" mapto="prevMarker" flags="m" />
-		<key id="KEY_FORWARD" mapto="nextMarker" flags="m" />
 		<key id="KEY_FAVORITES" mapto="showFavourites" flags="m" />
+		<key id="KEY_RIGHT" mapto="nextBouquet" flags="m" />
 		<key id="KEY_LEFT" mapto="prevBouquet" flags="m" />
-		<key id="KEY_RIGHT" mapto="nextBouquet" flags="m" />
+		<key id="KEY_REWIND" mapto="prevMarker" flags="m" />
+		<key id="KEY_FASTFORWARD" mapto="nextMarker" flags="m" />
+
 	</map>
 
 	<map context="ChannelSelectEditActions">
 		<key id="KEY_MENU" mapto="contextMenu" flags="m" />
-		<key id="KEY_FP_MENU" mapto="contextMenu" flags="m" />
 	</map>
 
@@ -412,6 +320,4 @@
 		<key id="KEY_9" mapto="9" flags="m" />
 		<key id="KEY_0" mapto="0" flags="m" />
-	  	<key id="KEY_FP_LEFT" mapto="left" flags="mr" />
-		<key id="KEY_FP_RIGHT" mapto="right" flags="mr" />
 	</map>
 
@@ -423,6 +329,6 @@
 		<key id="KEY_INFO" mapto="info" flags="m" />
 		<key id="KEY_MENU" mapto="input_date_time" flags="m" />
-		<key id="KEY_FILE" mapto="nextBouquet" flags="m" />
-		<key id="KEY_F5" mapto="prevBouquet" flags="m"/>
+		<key id="KEY_MEDIA" mapto="nextBouquet" flags="m" />
+		<key id="KEY_BOOKMARKS" mapto="prevBouquet" flags="m"/>
 		<key id="KEY_FASTFORWARD" mapto="nextBouquet" flags="m" />
 		<key id="KEY_REWIND" mapto="prevBouquet" flags="m" />
@@ -437,9 +343,4 @@
 		<key id="KEY_GREEN" mapto="timerAdd" flags="m" />
 		<key id="KEY_INFO" mapto="cancel" flags="m" />
-		<key id="KEY_FP_UP" mapto="pageUp" flags="mr" />
-		<key id="KEY_FP_DOWN" mapto="pageDown" flags="mr" />
-		<key id="KEY_FP_LEFT" mapto="prevEvent" flags="mr" />
-		<key id="KEY_FP_RIGHT" mapto="nextEvent" flags="mr" />
-		<key id="KEY_FP_BACK" mapto="cancel" flags="m" />
 	</map>
 
@@ -450,12 +351,6 @@
 
 	<map context="OkCancelActions">
-		<key id="\x0a" mapto="ok" flags="m" />
-		<key id="\x1b" mapto="cancel" flags="m" />
-		<key id="KEY_OK" mapto="ok" flags="m" />
-		<key id="KEY_EXIT" mapto="cancel" flags="m" />
-        <key id="KEY_FP_OK" mapto="ok" flags="m" />
-		<key id="KEY_FP_BACK" mapto="cancel" flags="m" />
-		<key id="KEY_ENTER" mapto="ok" flags="m" />
-		<key id="KEY_ESC" mapto="cancel" flags="m" />
+		<key id="KEY_OK" mapto="ok" flags="m" />
+		<key id="KEY_HOME" mapto="cancel" flags="m" />
 	</map>
 
@@ -475,16 +370,4 @@
 		<key id="KEY_UP" mapto="upUp" flags="b" />
 		<key id="KEY_DOWN" mapto="downUp" flags="b" />
-		<key id="KEY_FP_UP" mapto="up" flags="m" />
-		<key id="KEY_FP_DOWN" mapto="down" flags="m" />
-		<key id="KEY_FP_LEFT" mapto="left" flags="m" />
-		<key id="KEY_FP_RIGHT" mapto="right" flags="m" />
-		<key id="KEY_FP_UP" mapto="upRepeated" flags="r" />
-		<key id="KEY_FP_DOWN" mapto="downRepeated" flags="r" />
-		<key id="KEY_FP_LEFT" mapto="leftRepeated" flags="r" />
-		<key id="KEY_FP_RIGHT" mapto="rightRepeated" flags="r" />
-		<key id="KEY_FP_LEFT" mapto="leftUp" flags="b" />
-		<key id="KEY_FP_RIGHT" mapto="rightUp" flags="b" />
-		<key id="KEY_FP_UP" mapto="upUp" flags="b" />
-		<key id="KEY_FP_DOWN" mapto="downUp" flags="b" />
 	</map>
 
@@ -499,10 +382,6 @@
 		<key id="KEY_GREEN" mapto="alwaysOK" flags="m" />
 		<key id="KEY_OK" mapto="ok" flags="m" />
-		<key id="KEY_ENTER" mapto="ok" flags="m" />
 		<key id="KEY_RED" mapto="cancel" flags="m" />
-		<key id="KEY_EXIT" mapto="cancel" flags="m" />
-		<key id="KEY_ESC" mapto="cancel" flags="m" />
-		<key id="KEY_FP_OK" mapto="ok" flags="m" />
-		<key id="KEY_FP_BACK" mapto="cancel" flags="m" />
+		<key id="KEY_HOME" mapto="cancel" flags="m" />
 	</map>
 
@@ -515,9 +394,4 @@
 
 	<map context="ShortcutActions">
-		<key id="KEY_F1" mapto="red" flags="mr" />
-		<key id="KEY_F2" mapto="yellow" flags="mr" />
-		<key id="KEY_F3" mapto="green" flags="mr" />
-		<key id="KEY_F4" mapto="blue" flags="mr" />
-
 		<key id="KEY_RED" mapto="red" flags="mr" />
 		<key id="KEY_YELLOW" mapto="yellow" flags="mr" />
@@ -525,4 +399,5 @@
 		<key id="KEY_BLUE" mapto="blue" flags="mr" />
 	</map>
+
 	<map context="StandbyActions">
 		<key id="KEY_POWER" mapto="power" flags="m" />
@@ -531,7 +406,5 @@
 	<map context="SleepTimerEditorActions">
 		<key id="KEY_OK" mapto="select" flags="m" />
-		<key id="KEY_ENTER" mapto="select" flags="m" />
-		<key id="KEY_EXIT" mapto="exit" flags="m" />
-		<key id="KEY_ESC" mapto="exit" flags="m" />
+		<key id="KEY_HOME" mapto="exit" flags="m" />
 		<key id="KEY_1" mapto="1" flags="m" />
 		<key id="KEY_2" mapto="2" flags="m" />
@@ -550,8 +423,4 @@
 		<key id="KEY_GREEN" mapto="toggleAction" flags="mr" />
         <!--key id="KEY_BLUE" mapto="settings" flags="mr" /-->
-        <key id="KEY_FP_LEFT" mapto="selectLeft" flags="mr" />
-		<key id="KEY_FP_RIGHT" mapto="selectRight" flags="mr" />
-		<key id="KEY_FP_OK" mapto="select" flags="m" />
-		<key id="KEY_FP_BACK" mapto="exit" flags="m" />
 	</map>
 
@@ -559,6 +428,4 @@
 		<key id="KEY_LEFT" mapto="left" flags="mr" />
 		<key id="KEY_RIGHT" mapto="right" flags="mr" />
-		<key id="KEY_FP_LEFT" mapto="left" flags="mr" />
-		<key id="KEY_FP_RIGHT" mapto="right" flags="mr" />
 	</map>
 
@@ -574,5 +441,5 @@
 		<key id="KEY_FASTFORWARD" mapto="next" flags="m" />
 		<key id="KEY_PAUSE" mapto="pause" flags="m" />
-		<key id="KEY_PLAYPAUSE" mapto="pause" flags="m" />
+		<key id="KEY_SLOW" mapto="pause" flags="m" />
 		<key id="KEY_PLAY" mapto="play" flags="m" />
 		<key id="KEY_STOP" mapto="stop" flags="b" />
@@ -581,14 +448,13 @@
 		<key id="KEY_RECORD" mapto="shift_record" flags="l" />
 		<key id="KEY_PREVIOUS" mapto="previous" flags="m" />
-		<key id="KEY_NEXT" mapto="next" flags="m" />
 		<key id="KEY_MENU" mapto="menu" flags="m" />
 		<key id="KEY_2" mapto="skipListbegin" flags="m" />
 		<key id="KEY_8" mapto="skipListend" flags="m" />
-		<key id="KEY_PAGEUP" mapto="nextBouquet" flags="m" />
-		<key id="KEY_PAGEDOWN" mapto="prevBouquet" flags="m" />
-		<key id="KEY_VIDEO" mapto="delete" flags="m" />
+		<key id="KEY_CHANNELUP" mapto="nextBouquet" flags="m" />
+		<key id="KEY_CHANNELDOWN" mapto="prevBouquet" flags="m" />
 		<key id="KEY_AGAIN" mapto="delete" flags="m" />
 		<key id="KEY_SUBTITLE" mapto="subtitles" flags="m" />
 	</map>
+
 	<map context="PiPSetupActions">
 		<key id="KEY_UP" mapto="up" flags="mr" />
@@ -596,21 +462,10 @@
 		<key id="KEY_LEFT" mapto="left" flags="mr" />
 		<key id="KEY_RIGHT" mapto="right" flags="mr" />
-		<key id="KEY_EXIT" mapto="cancel" flags="m" />
-		<key id="KEY_ESC" mapto="cancel" flags="m" />
-		<key id="KEY_ENTER" mapto="ok" flags="m" />
-		<key id="KEY_OK" mapto="ok" flags="m" />
-		<key id="KEY_PAGEUP" mapto="size+" flags="mr" />
-		<key id="KEY_PAGEDOWN" mapto="size-" flags="mr" />
-		<key id="KEY_MOSAIC" mapto="size+" flags="mr" />
-		<key id="KEY_PIP_SWAP" mapto="size-" flags="mr" />
+		<key id="KEY_HOME" mapto="cancel" flags="m" />
+		<key id="KEY_OK" mapto="ok" flags="m" />
 		<key id="KEY_CHANNELUP" mapto="size+" flags="mr" />
 		<key id="KEY_CHANNELDOWN" mapto="size-" flags="mr" />
-		<key id="KEY_FP_UP" mapto="up" flags="mr" />
-		<key id="KEY_FP_DOWN" mapto="down" flags="mr" />
-		<key id="KEY_FP_LEFT" mapto="left" flags="mr" />
-		<key id="KEY_FP_RIGHT" mapto="right" flags="mr" />
-		<key id="KEY_FP_BACK" mapto="cancel" flags="m" />
-		<key id="KEY_FP_OK" mapto="ok" flags="m" />
-	</map>
+	</map>
+
 	<map context="aafActions">
 	  <key id="KEY_BLUE" mapto="extensions" flags="m" />
@@ -619,9 +474,10 @@
 	  <key id="KEY_RED" mapto="sonstiges" flags="m" />
 	</map>
+
 	<map context="DvdActions">
 		<key id="KEY_STOP" mapto="stop" flags="b" />
-		<key id="KEY_PAGEUP" mapto="nextBouquet" flags="m" />
-		<key id="KEY_PAGEDOWN" mapto="prevBouquet" flags="m" />
-		<key id="KEY_TEXT" mapto="subtitles" flags="m" />
+		<key id="KEY_CHANNELUP" mapto="nextBouquet" flags="m" />
+		<key id="KEY_CHANNELDOWN" mapto="prevBouquet" flags="m" />
+		<key id="KEY_SUBTITLE" mapto="subtitles" flags="m" />
 		<key id="KEY_RED" mapto="red" flags="m" />
 		<key id="KEY_YELLOW" mapto="yellow" flags="m" />