From 053747051c1d2b1988c0fa6d99af10ec5504836b Mon Sep 17 00:00:00 2001
From: Jonathan Marshall <jmarshall@never.you.mind>
Date: Thu, 7 Jul 2011 15:07:16 +1200
Subject: cleanup keymaps to utilize new Back action

---
 system/keymaps/appcommand.xml                      |   2 +-
 system/keymaps/gamepad.xml                         | 160 ++-------------
 ...ystick.Alienware.Dual.Compatible.Controller.xml |   2 +-
 system/keymaps/joystick.AppleRemote.xml            | 138 +------------
 system/keymaps/joystick.Harmony.xml                | 151 ++------------
 system/keymaps/joystick.Interact.AxisPad.xml       |   2 +-
 system/keymaps/joystick.Logitech.RumblePad.2.xml   | 169 +---------------
 .../joystick.Microsoft.Xbox.360.Controller.xml     | 161 ++-------------
 .../joystick.Microsoft.Xbox.Controller.S.xml       | 221 ++-------------------
 system/keymaps/joystick.PS3.Remote.Keyboard.xml    | 208 +------------------
 .../joystick.Sony.PLAYSTATION(R)3.Controller.xml   |   2 +-
 system/keymaps/joystick.WiiRemote.xml              |  85 +-------
 system/keymaps/keyboard.nyxboard.xml               | 189 +++---------------
 system/keymaps/keyboard.xml                        |   4 +-
 system/keymaps/remote.xml                          | 167 +++-------------
 15 files changed, 130 insertions(+), 1531 deletions(-)

diff --git a/system/keymaps/appcommand.xml b/system/keymaps/appcommand.xml
index 468125b11d..504f40416b 100644
--- a/system/keymaps/appcommand.xml
+++ b/system/keymaps/appcommand.xml
@@ -1,7 +1,7 @@
 <keymap>
   <global>
     <appcommand>
-      <browser_back>ParentDir</browser_back>
+      <browser_back>Back</browser_back>
       <browser_forward/>
       <browser_refresh/>
       <browser_stop>Stop</browser_stop>
diff --git a/system/keymaps/gamepad.xml b/system/keymaps/gamepad.xml
index 5c5a9b19ab..44e77dc0fe 100644
--- a/system/keymaps/gamepad.xml
+++ b/system/keymaps/gamepad.xml
@@ -38,7 +38,7 @@
   <global>
     <gamepad>
       <A>Select</A>
-      <B>ParentDir</B>
+      <B>Back</B>
       <X>FullScreen</X>
       <Y>Queue</Y>
       <white>ContextMenu</white>
@@ -72,9 +72,7 @@
   <MyMusicPlaylist>
     <gamepad>
       <Y>Delete</Y>
-      <black>Playlist</black>      <!-- Close playlist -->
-      <back>Playlist</back>      <!-- Close playlist -->
-      <B>Playlist</B>      <!-- Close playlist -->
+      <black>Back</black>
     </gamepad>
   </MyMusicPlaylist>
   <MyMusicPlaylistEditor>
@@ -113,18 +111,16 @@
   </FullscreenVideo>
   <FullscreenInfo>
     <gamepad>
-      <B>Close</B>
       <start>OSD</start>
       <black>CodecInfo</black>
-      <white>Close</white>
+      <white>Back</white>
       <leftanalogtrigger>AnalogRewind</leftanalogtrigger>
       <rightanalogtrigger>AnalogFastForward</rightanalogtrigger>
     </gamepad>
   </FullscreenInfo>
   <PlayerControls>
     <gamepad>
-      <back>Close</back>
-      <start>Close</start>
+      <start>Back</start>
     </gamepad>
   </PlayerControls>
   <Visualisation>
@@ -146,8 +142,7 @@
   </Visualisation>
   <MusicOSD>
     <gamepad>
-      <back>Close</back>
-      <start>Close</start>
+      <start>Back</start>
       <black>CodecInfo</black>
       <white>Info</white>
       <leftanalogtrigger>AnalogRewind</leftanalogtrigger>
@@ -156,19 +151,15 @@
   </MusicOSD>
   <VisualisationSettings>
     <gamepad>
-      <B>Close</B>
-      <back>Close</back>
-      <start>Close</start>
+      <start>Back</start>
       <leftanalogtrigger>AnalogRewind</leftanalogtrigger>
       <rightanalogtrigger>AnalogFastForward</rightanalogtrigger>
     </gamepad>
   </VisualisationSettings>
   <VisualisationPresetList>
     <gamepad>
-      <B>Close</B>
-      <back>Close</back>
-      <start>Close</start>
-      <Y>Close</Y>
+      <start>Back</start>
+      <Y>Back</Y>
       <leftanalogtrigger>AnalogRewind</leftanalogtrigger>
       <rightanalogtrigger>AnalogFastForward</rightanalogtrigger>
     </gamepad>
@@ -197,7 +188,6 @@
       <A>NextCalibration</A>
       <black>ResetCalibration</black>
       <white>NextResolution</white>
-      <B>PreviousMenu</B>
     </gamepad>
   </ScreenCalibration>
   <GUICalibration>
@@ -205,19 +195,11 @@
       <leftthumbstick>AnalogMove</leftthumbstick>
       <A>NextCalibration</A>
       <black>ResetCalibration</black>
-      <B>PreviousMenu</B>
     </gamepad>
   </GUICalibration>
-  <SelectDialog>
-    <gamepad>
-      <back>Close</back>
-    </gamepad>
-  </SelectDialog>
   <VideoOSD>
     <gamepad>
-      <start>Close</start>
-      <back>PreviousMenu</back>
-      <B>PreviousMenu</B>
+      <start>Back</start>
       <black>CodecInfo</black>
       <white>Info</white>
       <leftanalogtrigger>AnalogRewind</leftanalogtrigger>
@@ -229,7 +211,6 @@
       <Y>AspectRatio</Y>
       <B>Stop</B>
       <start>OSD</start>
-      <back>PreviousMenu</back>
       <white>Info</white>
       <black>CodecInfo</black>
       <leftanalogtrigger>AnalogRewind</leftanalogtrigger>
@@ -240,9 +221,7 @@
     <gamepad>
       <X/>
       <Y>AspectRatio</Y>
-      <B>Close</B>
-      <back>Close</back>
-      <start>Close</start>
+      <start>Back</start>
       <black>CodecInfo</black>
       <white>Info</white>
       <leftanalogtrigger>AnalogRewind</leftanalogtrigger>
@@ -253,9 +232,7 @@
     <gamepad>
       <X/>
       <Y>AspectRatio</Y>
-      <B>Close</B>
-      <back>Close</back>
-      <start>Close</start>
+      <start>Back</start>
       <black>CodecInfo</black>
       <white>Info</white>
       <leftanalogtrigger>AnalogRewind</leftanalogtrigger>
@@ -266,9 +243,7 @@
     <gamepad>
       <X/>
       <Y>Delete</Y>
-      <B>Close</B>
-      <back>Close</back>
-      <start>Close</start>
+      <start>Back</start>
       <leftanalogtrigger>AnalogRewind</leftanalogtrigger>
       <rightanalogtrigger>AnalogFastForward</rightanalogtrigger>
     </gamepad>
@@ -287,9 +262,7 @@
   <MyVideoPlaylist>
     <gamepad>
       <Y>Delete</Y>
-      <black>Playlist</black>      <!-- Close playlist -->
-      <back>Playlist</back>      <!-- Close playlist -->
-      <B>Playlist</B>
+      <black>Back</black>
     </gamepad>
   </MyVideoPlaylist>
   <VirtualKeyboard>
@@ -304,8 +277,7 @@
   </VirtualKeyboard>
   <ContextMenu>
     <gamepad>
-      <white>Close</white>
-      <B>Close</B>
+      <white>Back</white>
     </gamepad>
   </ContextMenu>
   <Scripts>
@@ -326,120 +298,20 @@
       <start>Stop</start>      <!-- Enter Password -->
     </gamepad>
   </GamepadInput>
-  <Weather>
-    <gamepad>
-      <B>PreviousMenu</B>
-    </gamepad>
-  </Weather>
-  <Settings>
-    <gamepad>
-      <B>PreviousMenu</B>
-    </gamepad>
-  </Settings>
-  <AddonInformation>
-    <gamepad>
-      <b>Close</b>
-    </gamepad>
-  </AddonInformation>
-  <AddonSettings>
-    <gamepad>
-      <b>Close</b>
-    </gamepad>
-  </AddonSettings>
-  <TextViewer>
-    <gamepad>
-      <b>Close</b>
-    </gamepad>
-  </TextViewer>
-  <MyPicturesSettings>
-    <gamepad>
-      <B>PreviousMenu</B>
-    </gamepad>
-  </MyPicturesSettings>
-  <MyProgramsSettings>
-    <gamepad>
-      <B>PreviousMenu</B>
-    </gamepad>
-  </MyProgramsSettings>
-  <MyWeatherSettings>
-    <gamepad>
-      <B>PreviousMenu</B>
-    </gamepad>
-  </MyWeatherSettings>
-  <MyMusicSettings>
-    <gamepad>
-      <B>PreviousMenu</B>
-    </gamepad>
-  </MyMusicSettings>
-  <SystemSettings>
-    <gamepad>
-      <B>PreviousMenu</B>
-    </gamepad>
-  </SystemSettings>
-  <MyVideosSettings>
-    <gamepad>
-      <B>PreviousMenu</B>
-    </gamepad>
-  </MyVideosSettings>
-  <NetworkSettings>
-    <gamepad>
-      <B>PreviousMenu</B>
-    </gamepad>
-  </NetworkSettings>
-  <AppearanceSettings>
-    <gamepad>
-      <B>PreviousMenu</B>
-    </gamepad>
-  </AppearanceSettings>
-  <Profiles>
-    <gamepad>
-      <B>PreviousMenu</B>
-    </gamepad>
-  </Profiles>
-  <systeminfo>
-    <gamepad>
-      <B>PreviousMenu</B>
-    </gamepad>
-  </systeminfo>
-  <shutdownmenu>
-    <gamepad>
-      <B>PreviousMenu</B>
-    </gamepad>
-  </shutdownmenu>
-  <submenu>
-    <gamepad>
-      <B>PreviousMenu</B>
-    </gamepad>
-  </submenu>
-  <MusicInformation>
-    <gamepad>
-      <B>Close</B>
-    </gamepad>
-  </MusicInformation>
-  <MovieInformation>
-    <gamepad>
-      <B>Close</B>
-    </gamepad>
-  </MovieInformation>
   <LockSettings>
     <gamepad>
-      <start>Close</start>
-      <B>PreviousMenu</B>
-      <back>PreviousMenu</back>
+      <start>Back</start>
     </gamepad>
   </LockSettings>
   <ProfileSettings>
     <gamepad>
-      <start>Close</start>
-      <B>PreviousMenu</B>
-      <back>PreviousMenu</back>
+      <start>Back</start>
     </gamepad>
   </ProfileSettings>
   <PictureInfo>
     <gamepad>
       <dpadleft>PreviousPicture</dpadleft>
       <dpadright>NextPicture</dpadright>
-      <black>Close</black>
     </gamepad>
   </PictureInfo>
 </keymap>
diff --git a/system/keymaps/joystick.Alienware.Dual.Compatible.Controller.xml b/system/keymaps/joystick.Alienware.Dual.Compatible.Controller.xml
index 3f22913ede..ebe3dab633 100644
--- a/system/keymaps/joystick.Alienware.Dual.Compatible.Controller.xml
+++ b/system/keymaps/joystick.Alienware.Dual.Compatible.Controller.xml
@@ -42,7 +42,7 @@
     <joystick name="Alienware Alienware Dual Compatible Game Pad">
       <button id="1">FullScreen</button> <!--square -->
       <button id="2">Select</button>  <!--x --> 
-      <button id="3">ParentDir</button>   <!--circle --> 
+      <button id="3">Back</button>   <!--circle --> 
       <button id="4">Queue</button> <!-- tri -->
       <button id="6">PreviousMenu</button> <!-- l1 -->
       <button id="7"></button>  <!-- l2 -->      
diff --git a/system/keymaps/joystick.AppleRemote.xml b/system/keymaps/joystick.AppleRemote.xml
index ccbc9cf4c7..3ce6d4d06d 100644
--- a/system/keymaps/joystick.AppleRemote.xml
+++ b/system/keymaps/joystick.AppleRemote.xml
@@ -35,7 +35,7 @@
       <!-- left       -->      <button id="3">Left</button>
       <!-- right      -->      <button id="4">Right</button>
       <!-- center     -->      <button id="5">Select</button>
-      <!-- menu       -->      <button id="6">PreviousMenu</button>
+      <!-- menu       -->      <button id="6">Back</button>
       <!-- hold center-->      <button id="7">Fullscreen</button>
       <!-- hold menu  -->      <button id="8">ContextMenu</button>
 
@@ -87,36 +87,6 @@
       <button id="8">ActivateWindow(shutdownmenu)</button>
     </joystick>
   </Home>
-  <Favourites>
-    <joystick name="AppleRemote">
-      <button id="6">Close</button>
-    </joystick>
-  </Favourites>
-  <MyPictures>
-    <joystick name="AppleRemote">
-      <button id="6">ParentDir</button>
-    </joystick>
-  </MyPictures>
-  <MyMusicPlaylist>
-    <joystick name="AppleRemote">
-      <button id="6">Playlist</button>
-    </joystick>
-  </MyMusicPlaylist>
-  <MyMusicPlaylistEditor>
-    <joystick name="AppleRemote">
-      <button id="6">ParentDir</button>
-    </joystick>
-  </MyMusicPlaylistEditor>
-  <MyMusicFiles>
-    <joystick name="AppleRemote">
-      <button id="6">ParentDir</button>
-    </joystick>
-  </MyMusicFiles>
-  <MyMusicLibrary>
-    <joystick name="AppleRemote">
-      <button id="6">ParentDir</button>
-    </joystick>
-  </MyMusicLibrary>
   <FullscreenVideo>
     <joystick name="AppleRemote">
       <button id="1">VolumeUp</button>
@@ -141,16 +111,6 @@
       <!-- FlickDown  -->      <button id="88">BigStepBack</button>
     </joystick>
   </FullscreenVideo>
-  <FullscreenInfo>
-    <joystick name="AppleRemote">
-      <button id="6">Close</button>
-    </joystick>
-  </FullscreenInfo>
-  <PlayerControls>
-    <joystick name="AppleRemote">
-      <button id="6">Close</button>
-    </joystick>
-  </PlayerControls>
   <Visualisation>
     <joystick name="AppleRemote">
       <button id="1">VolumeUp</button>
@@ -167,21 +127,6 @@
       <!-- FlickRight -->      <button id="86">SkipNext</button>
     </joystick>
   </Visualisation>
-  <MusicOSD>
-    <joystick name="AppleRemote">
-      <button id="6">Close</button>
-    </joystick>
-  </MusicOSD>
-  <VisualisationSettings>
-    <joystick name="AppleRemote">
-      <button id="6">Close</button>
-    </joystick>
-  </VisualisationSettings>
-  <VisualisationPresetList>
-    <joystick name="AppleRemote">
-      <button id="6">Close</button>
-    </joystick>
-  </VisualisationPresetList>
   <SlideShow>
     <joystick name="AppleRemote">
       <button id="1">ZoomIn</button>
@@ -202,15 +147,9 @@
       <button id="5">NextCalibration</button>
     </joystick>
   </ScreenCalibration>
-  <SelectDialog>
-    <joystick name="AppleRemote">
-      <button id="6">Close</button>
-    </joystick>
-  </SelectDialog>
   <VideoOSD>
     <joystick name="AppleRemote">
-      <button id="6">Close</button>
-      <button id="7">Close</button>
+      <button id="7">Back</button>
     </joystick>
   </VideoOSD>
   <VideoMenu>
@@ -221,97 +160,24 @@
       <button id="8"/>
     </joystick>
   </VideoMenu>
-  <OSDVideoSettings>
-    <joystick name="AppleRemote">
-      <button id="6">Close</button>
-    </joystick>
-  </OSDVideoSettings>
-  <OSDAudioSettings>
-    <joystick name="AppleRemote">
-      <button id="6">Close</button>
-    </joystick>
-  </OSDAudioSettings>
-  <VideoBookmarks>
-    <joystick name="AppleRemote">
-      <button id="6">Close</button>
-    </joystick>
-  </VideoBookmarks>
   <MyVideoLibrary>
     <joystick name="AppleRemote">
-      <button id="6">ParentDir</button>
       <button id="7">Info</button>
     </joystick>
   </MyVideoLibrary>
   <MyVideoFiles>
     <joystick name="AppleRemote">
-      <button id="6">ParentDir</button>
       <button id="7">Info</button>
     </joystick>
   </MyVideoFiles>
-  <MyVideoPlaylist>
-    <joystick name="AppleRemote">
-      <button id="6">Playlist</button>
-    </joystick>
-  </MyVideoPlaylist>
-  <VirtualKeyboard>
-    <joystick name="AppleRemote">
-      <button id="6">Close</button>
-    </joystick>
-  </VirtualKeyboard>
-  <ContextMenu>
-    <joystick name="AppleRemote">
-      <button id="6">Close</button>
-    </joystick>
-  </ContextMenu>
-  <FileStackingDialog>
-    <joystick name="AppleRemote">
-      <button id="6">Close</button>
-    </joystick>
-  </FileStackingDialog>
-  <MusicInformation>
-    <joystick name="AppleRemote">
-      <button id="6">Close</button>
-    </joystick>
-  </MusicInformation>
-  <MovieInformation>
-    <joystick name="AppleRemote">
-      <button id="6">Close</button>
-    </joystick>
-  </MovieInformation>
   <PictureInfo>
     <joystick name="AppleRemote">
       <button id="3">Left</button>
       <button id="4">Right</button>
-      <button id="6">Close</button>
       <!-- SwipeLeft  -->      <button id="80">Left</button>
       <!-- SwipeRight -->      <button id="81">Right</button>
       <!-- FlickLeft  -->      <button id="85">Left</button>
       <!-- FlickRight -->      <button id="86">Right</button>
     </joystick>
   </PictureInfo>
-  <AddonBrowser>
-    <joystick name="AppleRemote">
-      <button id="6">ParentDir</button>
-    </joystick>
-  </AddonBrowser>
-  <AddonInformation>
-    <joystick name="AppleRemote">
-      <button id="6">Close</button>
-    </joystick>
-  </AddonInformation>
-  <AddonSettings>
-    <joystick name="AppleRemote">
-      <button id="6">Close</button>
-    </joystick>
-  </AddonSettings>
-  <TextViewer>
-    <joystick name="AppleRemote">
-      <button id="6">Close</button>
-    </joystick>
-  </TextViewer>
-  <NumericInput>
-    <joystick name="AppleRemote">
-      <button id="6">Close</button>
-    </joystick>
-  </NumericInput>
 </keymap>
diff --git a/system/keymaps/joystick.Harmony.xml b/system/keymaps/joystick.Harmony.xml
index 9d72d5dbe6..a9f6baf343 100644
--- a/system/keymaps/joystick.Harmony.xml
+++ b/system/keymaps/joystick.Harmony.xml
@@ -57,7 +57,7 @@
       <!-- Rew       	-->      <button id="41">Rewind</button>
       <!-- Fwd  	-->      <button id="42">FastForward</button>
       <!-- Pause	-->      <button id="26">Pause</button>
-      <!-- Prev		-->      <button id="32">ParentDir</button>
+      <!-- Prev		-->      <button id="32">Back</button>
       <!-- Guide  	-->      <button id="65">FullScreen</button>
       <!-- Info  	-->      <button id="31">Info</button>
       <!-- Exit 	-->      <button id="51">PreviousMenu</button>
@@ -79,7 +79,7 @@
       <!-- 8 		-->      <button id="34">Number8</button>
       <!-- 9 		-->      <button id="43">Number9</button>
       <!-- 0 		-->      <button id="44">Number0</button>
-      <!-- * clear 	-->      <button id="45">ParentDir</button>
+      <!-- * clear 	-->      <button id="45">Back</button>
       <!-- # enter 	-->      <button id="36">Select</button>
       <!-- Mute		-->      <button id="25">Mute</button>
       <!-- Aspect	-->      <button id="61">AspectRatio</button>
@@ -127,7 +127,6 @@
   </MyFiles>
   <MyMusicPlaylist>
     <joystick name="Harmony">
-      <!-- Prev		-->      <button id="32">Playlist</button>
       <!-- * clear 	-->      <button id="45">Delete</button>
       <!-- Channel Up  	-->      <button id="71">MoveItemUp</button>
       <!-- Channel Down -->      <button id="72">MoveItemDown</button>
@@ -175,12 +174,12 @@
   </FullscreenVideo>
   <FullscreenInfo>
     <joystick name="Harmony">
-      <!-- Info  	-->      <button id="31">Close</button>
+      <!-- Info  	-->      <button id="31">Back</button>
     </joystick>
   </FullscreenInfo>
   <PlayerControls>
     <joystick name="Harmony">
-      <!-- menu       	-->      <button id="6">Close</button>
+      <!-- menu       	-->      <button id="6">Back</button>
     </joystick>
   </PlayerControls>
   <Visualisation>
@@ -198,21 +197,18 @@
   </Visualisation>
   <MusicOSD>
     <joystick name="Harmony">
-      <!-- menu       	-->      <button id="6">Close</button>
+      <!-- menu       	-->      <button id="6">Back</button>
       <!-- Info  	-->      <button id="31">CodecInfo</button>
-      <!-- Exit 	-->      <button id="51">Close</button>
     </joystick>
   </MusicOSD>
   <VisualisationSettings>
     <joystick name="Harmony">
-      <!-- menu       	-->      <button id="6">Close</button>
-      <!-- Exit 	-->      <button id="51">Close</button>
+      <!-- menu       	-->      <button id="6">Back</button>
     </joystick>
   </VisualisationSettings>
   <VisualisationPresetList>
     <joystick name="Harmony">
-      <!-- menu       	-->      <button id="6">Close</button>
-      <!-- Exit 	-->      <button id="51">Close</button>
+      <!-- menu       	-->      <button id="6">Back</button>
     </joystick>
   </VisualisationPresetList>
   <SlideShow>
@@ -248,44 +244,30 @@
       <!-- # enter 	-->      <button id="36">NextCalibration</button>
     </joystick>
   </GUICalibration>
-  <SelectDialog>
-    <joystick name="Harmony">
-      <!-- Exit 	-->      <button id="51">Close</button>
-      <!-- Prev		-->      <button id="32">Close</button>
-    </joystick>
-  </SelectDialog>
   <VideoOSD>
     <joystick name="Harmony">
-      <!-- menu       	-->      <button id="6">Close</button>
-      <!-- Exit 	-->      <button id="51">Close</button>
-      <!-- Prev		-->      <button id="32">PreviousMenu</button>
+      <!-- menu       	-->      <button id="6">Back</button>
     </joystick>
   </VideoOSD>
   <VideoMenu>
     <joystick name="Harmony">
       <!-- menu       	-->      <button id="6">OSD</button>
-      <!-- Prev		-->      <button id="32">PreviousMenu</button>
       <!-- Info  	-->      <button id="31">Info</button>
     </joystick>
   </VideoMenu>
   <OSDVideoSettings>
     <joystick name="Harmony">
-      <!-- Prev		-->      <button id="32">Close</button>
-      <!-- menu       	-->      <button id="6">Close</button>
+      <!-- menu       	-->      <button id="6">Back</button>
     </joystick>
   </OSDVideoSettings>
   <OSDAudioSettings>
     <joystick name="Harmony">
-      <!-- Prev		-->      <button id="32">Close</button>
-      <!-- menu       	-->      <button id="6">Close</button>
-      <!-- Exit 	-->      <button id="51">Close</button>
+      <!-- menu       	-->      <button id="6">Back</button>
     </joystick>
   </OSDAudioSettings>
   <VideoBookmarks>
     <joystick name="Harmony">
-      <!-- Prev		-->      <button id="32">Close</button>
-      <!-- menu       	-->      <button id="6">Close</button>
-      <!-- Exit 	-->      <button id="51">Close</button>
+      <!-- menu       	-->      <button id="6">Back</button>
       <!-- * clear 	-->      <button id="45">Delete</button>
     </joystick>
   </VideoBookmarks>
@@ -320,7 +302,6 @@
   </MyVideoFiles>
   <MyVideoPlaylist>
     <joystick name="Harmony">
-      <!-- Prev		-->      <button id="32">Playlist</button>      <!-- Close playlist -->
       <!-- * clear 	-->      <button id="45">Delete</button>
       <!-- Channel Up  	-->      <button id="71">MoveItemUp</button>
       <!-- Channel Down -->      <button id="72">MoveItemDown</button>
@@ -345,16 +326,6 @@
       <!-- Fwd  	-->      <button id="42">CursorRight</button>
     </joystick>
   </VirtualKeyboard>
-  <ContextMenu>
-    <joystick name="Harmony">
-      <!-- Prev		-->      <button id="32">Close</button>
-    </joystick>
-  </ContextMenu>
-  <FileStackingDialog>
-    <joystick name="Harmony">
-      <!-- Prev		-->      <button id="32">Close</button>
-    </joystick>
-  </FileStackingDialog>
   <Scripts>
     <joystick name="Harmony">
       <!-- Info  	-->      <button id="31">info</button>
@@ -375,121 +346,31 @@
       <!-- Prev		-->      <button id="32">BackSpace</button>
     </joystick>
   </NumericInput>
-  <Weather>
-    <joystick name="Harmony">
-      <!-- Prev		-->      <button id="32">PreviousMenu</button>
-    </joystick>
-  </Weather>
-  <Settings>
-    <joystick name="Harmony">
-      <!-- Prev		-->      <button id="32">PreviousMenu</button>
-    </joystick>
-  </Settings>
-  <MyPicturesSettings>
-    <joystick name="Harmony">
-      <!-- Prev		-->      <button id="32">PreviousMenu</button>
-    </joystick>
-  </MyPicturesSettings>
-  <MyProgramsSettings>
-    <joystick name="Harmony">
-      <!-- Prev		-->      <button id="32">PreviousMenu</button>
-    </joystick>
-  </MyProgramsSettings>
-  <MyWeatherSettings>
-    <joystick name="Harmony">
-      <!-- Prev		-->      <button id="32">PreviousMenu</button>
-    </joystick>
-  </MyWeatherSettings>
-  <MyMusicSettings>
-    <joystick name="Harmony">
-      <!-- Prev		-->      <button id="32">PreviousMenu</button>
-    </joystick>
-  </MyMusicSettings>
-  <SystemSettings>
-    <joystick name="Harmony">
-      <!-- Prev		-->      <button id="32">PreviousMenu</button>
-    </joystick>
-  </SystemSettings>
-  <MyVideosSettings>
-    <joystick name="Harmony">
-      <!-- Prev		-->      <button id="32">PreviousMenu</button>
-    </joystick>
-  </MyVideosSettings>
-  <NetworkSettings>
-    <joystick name="Harmony">
-      <!-- Prev		-->      <button id="32">PreviousMenu</button>
-    </joystick>
-  </NetworkSettings>
-  <AppearanceSettings>
-    <joystick name="Harmony">
-      <!-- Prev		-->      <button id="32">PreviousMenu</button>
-    </joystick>
-  </AppearanceSettings>
-  <Profiles>
-    <joystick name="Harmony">
-      <!-- Prev		-->      <button id="32">PreviousMenu</button>
-    </joystick>
-  </Profiles>
-  <systeminfo>
-    <joystick name="Harmony">
-      <!-- Prev		-->      <button id="32">PreviousMenu</button>
-    </joystick>
-  </systeminfo>
-  <shutdownmenu>
-    <joystick name="Harmony">
-      <!-- Prev		-->      <button id="32">PreviousMenu</button>
-    </joystick>
-  </shutdownmenu>
-  <submenu>
-    <joystick name="Harmony">
-      <!-- Prev		-->      <button id="32">PreviousMenu</button>
-    </joystick>
-  </submenu>
   <MusicInformation>
     <joystick name="Harmony">
-      <!-- Prev		-->      <button id="32">Close</button>
-      <!-- menu       	-->      <button id="6">Close</button>
+      <!-- menu       	-->      <button id="6">Back</button>
     </joystick>
   </MusicInformation>
   <MovieInformation>
     <joystick name="Harmony">
-      <!-- Prev		-->      <button id="32">Close</button>
-      <!-- menu       	-->      <button id="6">Close</button>
+      <!-- menu       	-->      <button id="6">Back</button>
     </joystick>
   </MovieInformation>
   <LockSettings>
     <joystick name="Harmony">
-      <!-- menu       	-->      <button id="6">Close</button>
-      <!-- Prev		-->      <button id="32">PreviousMenu</button>
+      <!-- menu       	-->      <button id="6">Back</button>
     </joystick>
   </LockSettings>
   <ProfileSettings>
     <joystick name="Harmony">
-      <!-- menu       	-->      <button id="6">Close</button>
-      <!-- Prev		-->      <button id="32">PreviousMenu</button>
+      <!-- menu       	-->      <button id="6">Back</button>
     </joystick>
   </ProfileSettings>
   <PictureInfo>
     <joystick name="Harmony">
       <!-- Replay       -->      <button id="91">PreviousPicture</button>
       <!-- Skip      	-->      <button id="92">NextPicture</button>
-      <!-- Info  	-->      <button id="31">Close</button>
-      <!-- Prev		-->      <button id="32">Close</button>
+      <!-- Info  	-->      <button id="31">Back</button>
     </joystick>
   </PictureInfo>
-  <AddonInformation>
-    <joystick name="Harmony">
-      <!-- Prev		-->      <button id="32">Close</button>
-    </joystick>
-  </AddonInformation>
-  <AddonSettings>
-    <joystick name="Harmony">
-      <!-- Prev		-->      <button id="32">Close</button>
-    </joystick>
-  </AddonSettings>
-  <TextViewer>
-    <joystick name="Harmony">
-      <!-- Prev		-->      <button id="32">Close</button>
-    </joystick>
-  </TextViewer>
 </keymap>
diff --git a/system/keymaps/joystick.Interact.AxisPad.xml b/system/keymaps/joystick.Interact.AxisPad.xml
index 4f493cf45a..29364eb4d2 100644
--- a/system/keymaps/joystick.Interact.AxisPad.xml
+++ b/system/keymaps/joystick.Interact.AxisPad.xml
@@ -40,7 +40,7 @@
       <altname>Interact AxisPad</altname>
       <button id="1">FullScreen</button> <!--square -->
       <button id="3">Select</button>  <!--x --> 
-      <button id="4">ParentDir</button>   <!--circle --> 
+      <button id="4">Back</button>   <!--circle --> 
       <button id="2">Queue</button> <!-- tri -->
       <button id="5">PreviousMenu</button> <!-- l1 -->
       <button id="7"></button>  <!-- l2 -->      
diff --git a/system/keymaps/joystick.Logitech.RumblePad.2.xml b/system/keymaps/joystick.Logitech.RumblePad.2.xml
index c639e9d060..7927a58e52 100644
--- a/system/keymaps/joystick.Logitech.RumblePad.2.xml
+++ b/system/keymaps/joystick.Logitech.RumblePad.2.xml
@@ -4,7 +4,7 @@
       <altname>Logitech Cordless RumblePad 2</altname>
       <button id="1">FullScreen</button>
       <button id="2">Select</button>
-      <button id="3">PreviousMenu</button>
+      <button id="3">Back</button>
       <button id="7">FullScreen</button>
       <button id="8">ContextMenu</button>
       <button id="10">XBMC.ActivateWindow(Home)</button>
@@ -32,31 +32,9 @@
     </joystick>
   </Home>
 
-  <MyPictures>
-    <joystick name="Logitech Logitech Cordless RumblePad 2">
-      <altname>Logitech Cordless RumblePad 2</altname>
-      <button id="3">ParentDir</button>
-    </joystick>
-  </MyPictures>
-
-  <MyMusicPlaylist>
-    <joystick name="Logitech Logitech Cordless RumblePad 2">
-      <altname>Logitech Cordless RumblePad 2</altname>
-      <button id="3">Playlist</button>
-    </joystick>
-  </MyMusicPlaylist>
-
-  <MyMusicPlaylistEditor>
-    <joystick name="Logitech Logitech Cordless RumblePad 2">
-      <altname>Logitech Cordless RumblePad 2</altname>
-      <button id="3">Playlist</button>
-    </joystick>
-  </MyMusicPlaylistEditor>
-
   <MyMusicFiles>
     <joystick name="Logitech Logitech Cordless RumblePad 2">
       <altname>Logitech Cordless RumblePad 2</altname>
-      <button id="3">ParentDir</button>
       <button id="4">Queue</button>
     </joystick>
   </MyMusicFiles>
@@ -64,7 +42,6 @@
   <MyMusicLibrary>
     <joystick name="Logitech Logitech Cordless RumblePad 2">
       <altname>Logitech Cordless RumblePad 2</altname>
-      <button id="3">ParentDir</button>
       <button id="4">Queue</button>
     </joystick>
   </MyMusicLibrary>
@@ -86,20 +63,6 @@
     </joystick>
   </FullscreenVideo>
 
-  <FullscreenInfo>
-    <joystick name="Logitech Logitech Cordless RumblePad 2">
-      <altname>Logitech Cordless RumblePad 2</altname>
-      <button id="3">Close</button>
-    </joystick>
-  </FullscreenInfo>
-
-  <PlayerControls>
-    <joystick name="Logitech Logitech Cordless RumblePad 2">
-      <altname>Logitech Cordless RumblePad 2</altname>
-      <button id="3">Close</button>
-    </joystick>
-  </PlayerControls>
-
   <Visualisation>
     <joystick name="Logitech Logitech Cordless RumblePad 2">
       <altname>Logitech Cordless RumblePad 2</altname>
@@ -117,27 +80,6 @@
     </joystick>
   </Visualisation>
 
-  <MusicOSD>
-    <joystick name="Logitech Logitech Cordless RumblePad 2">
-      <altname>Logitech Cordless RumblePad 2</altname>
-      <button id="3">Close</button>
-    </joystick>
-  </MusicOSD>
-
-  <VisualisationSettings>
-    <joystick name="Logitech Logitech Cordless RumblePad 2">
-      <altname>Logitech Cordless RumblePad 2</altname>
-      <button id="3">Close</button>
-    </joystick>
-  </VisualisationSettings>
-
-  <VisualisationPresetList>
-    <joystick name="Logitech Logitech Cordless RumblePad 2">
-      <altname>Logitech Cordless RumblePad 2</altname>
-      <button id="3">Close</button>
-    </joystick>
-  </VisualisationPresetList>
-
   <SlideShow>
     <joystick name="Logitech Logitech Cordless RumblePad 2">
       <altname>Logitech Cordless RumblePad 2</altname>
@@ -160,45 +102,9 @@
     </joystick>
   </ScreenCalibration>
 
-  <SelectDialog>
-    <joystick name="Logitech Logitech Cordless RumblePad 2">
-      <altname>Logitech Cordless RumblePad 2</altname>
-      <button id="3">Close</button>
-    </joystick>
-  </SelectDialog>
-
-  <VideoOSD>
-    <joystick name="Logitech Logitech Cordless RumblePad 2">
-      <altname>Logitech Cordless RumblePad 2</altname>
-      <button id="3">Close</button>
-    </joystick>
-  </VideoOSD>
-
-  <OSDVideoSettings>
-    <joystick name="Logitech Logitech Cordless RumblePad 2">
-      <altname>Logitech Cordless RumblePad 2</altname>
-      <button id="3">Close</button>
-    </joystick>
-  </OSDVideoSettings>
-
-  <OSDAudioSettings>
-    <joystick name="Logitech Logitech Cordless RumblePad 2">
-      <altname>Logitech Cordless RumblePad 2</altname>
-      <button id="3">Close</button>
-    </joystick>
-  </OSDAudioSettings>
-
-  <VideoBookmarks>
-    <joystick name="Logitech Logitech Cordless RumblePad 2">
-      <altname>Logitech Cordless RumblePad 2</altname>
-      <button id="3">Close</button>
-    </joystick>
-  </VideoBookmarks>
-
   <MyVideoLibrary>
     <joystick name="Logitech Logitech Cordless RumblePad 2">
       <altname>Logitech Cordless RumblePad 2</altname>
-      <button id="3">ParentDir</button>
       <button id="4">Queue</button>
       <button id="5">Info</button>
     </joystick>
@@ -207,19 +113,11 @@
   <MyVideoFiles>
     <joystick name="Logitech Logitech Cordless RumblePad 2">
       <altname>Logitech Cordless RumblePad 2</altname>
-      <button id="3">ParentDir</button>
       <button id="4">Queue</button>
       <button id="5">Info</button>
     </joystick>
   </MyVideoFiles>
 
-  <MyVideoPlaylist>
-    <joystick name="Logitech Logitech Cordless RumblePad 2">
-      <altname>Logitech Cordless RumblePad 2</altname>
-      <button id="3">Playlist</button>
-    </joystick>
-  </MyVideoPlaylist>
-
   <VirtualKeyboard>
     <joystick name="Logitech Logitech Cordless RumblePad 2">
       <altname>Logitech Cordless RumblePad 2</altname>
@@ -228,72 +126,9 @@
       <button id="4">Shift</button>
       <button id="5">CursorLeft</button>
       <button id="6">CursorRight</button>
-      <button id="9">Close</button>
+      <button id="9">Back</button>
       <button id="10">Enter</button>
     </joystick>
   </VirtualKeyboard>
 
-  <ContextMenu>
-    <joystick name="Logitech Logitech Cordless RumblePad 2">
-      <altname>Logitech Cordless RumblePad 2</altname>
-      <button id="3">Close</button>
-    </joystick>
-  </ContextMenu>
-
-  <FileStackingDialog>
-    <joystick name="Logitech Logitech Cordless RumblePad 2">
-      <altname>Logitech Cordless RumblePad 2</altname>
-      <button id="3">Close</button>
-    </joystick>
-  </FileStackingDialog>
-
-  <MusicInformation>
-    <joystick name="Logitech Logitech Cordless RumblePad 2">
-      <altname>Logitech Cordless RumblePad 2</altname>
-      <button id="3">Close</button>
-    </joystick>
-  </MusicInformation>
-
-  <MovieInformation>
-    <joystick name="Logitech Logitech Cordless RumblePad 2">
-      <altname>Logitech Cordless RumblePad 2</altname>
-      <button id="3">Close</button>
-    </joystick>
-  </MovieInformation>
-
-  <PictureInfo>
-    <joystick name="Logitech Logitech Cordless RumblePad 2">
-      <altname>Logitech Cordless RumblePad 2</altname>
-      <button id="3">Close</button>
-    </joystick>
-  </PictureInfo>
-
-  <AddonInformation>
-    <joystick name="Logitech Logitech Cordless RumblePad 2">
-      <altname>Logitech Cordless RumblePad 2</altname>
-      <button id="3">Close</button>
-    </joystick>
-  </AddonInformation>
-
-  <AddonSettings>
-    <joystick name="Logitech Logitech Cordless RumblePad 2">
-      <altname>Logitech Cordless RumblePad 2</altname>
-      <button id="3">Close</button>
-    </joystick>
-  </AddonSettings>
-
-  <TextViewer>
-    <joystick name="Logitech Logitech Cordless RumblePad 2">
-      <altname>Logitech Cordless RumblePad 2</altname>
-      <button id="3">Close</button>
-    </joystick>
-  </TextViewer>
-
-  <NumericInput>
-    <joystick name="Logitech Logitech Cordless RumblePad 2">
-      <altname>Logitech Cordless RumblePad 2</altname>
-      <button id="3">Close</button>
-    </joystick>
-  </NumericInput>
-
 </keymap>
diff --git a/system/keymaps/joystick.Microsoft.Xbox.360.Controller.xml b/system/keymaps/joystick.Microsoft.Xbox.360.Controller.xml
index faf9d3d08d..ee1769031d 100644
--- a/system/keymaps/joystick.Microsoft.Xbox.360.Controller.xml
+++ b/system/keymaps/joystick.Microsoft.Xbox.360.Controller.xml
@@ -38,7 +38,7 @@
   <global>
     <joystick name="Xbox 360 Wireless Receiver">
       <button id="1">Select</button> <!-- A -->
-      <button id="2">ParentDir</button> <!-- B -->
+      <button id="2">Back</button> <!-- B -->
       <button id="3"></button> <!-- X -->
       <button id="4"></button> <!-- Y -->
       <button id="5"></button> <!-- LB -->
@@ -74,9 +74,7 @@
   </MyFiles>
   <MyMusicPlaylist>
     <joystick name="Xbox 360 Wireless Receiver">
-      <button id="2">Playlist</button>
-      <button id="3">Playlist</button>
-      <button id="17">Playlist</button>
+      <button id="3">Back</button>
       <button id="5">Delete</button>
     </joystick>
   </MyMusicPlaylist>
@@ -111,9 +109,8 @@
   </FullscreenVideo>
   <FullscreenInfo>
     <joystick name="Xbox 360 Wireless Receiver">
-      <button id="2">Close</button>
       <button id="3">CodecInfo</button>
-      <button id="6">Close</button>
+      <button id="6">Back</button>
       <button id="9">OSD</button>
       <axis limit="0" id="3">AnalogRewind</axis>
       <axis limit="0" id="6">AnalogFastForward</axis>
@@ -121,8 +118,7 @@
   </FullscreenInfo>
   <PlayerControls>
     <joystick name="Xbox 360 Wireless Receiver">
-      <button id="9">Close</button>
-      <button id="17">Close</button>
+      <button id="9">Back</button>
     </joystick>
   </PlayerControls>
   <Visualisation>
@@ -143,25 +139,22 @@
   </Visualisation>
   <MusicOSD>
     <joystick name="Xbox 360 Wireless Receiver">
-      <button id="17">Close</button>
-      <button id="19">Close</button>
+      <button id="19">Back</button>
       <button id="3">CodecInfo</button>
       <button id="6">Info</button>
     </joystick>
   </MusicOSD>
   <VisualisationSettings>
     <joystick name="Xbox 360 Wireless Receiver">
-      <button id="2">Close</button>
-      <button id="3">Close</button>
-      <button id="9">Close</button>
+      <button id="3">Back</button>
+      <button id="9">Back</button>
     </joystick>
   </VisualisationSettings>
   <VisualisationPresetList>
     <joystick name="Xbox 360 Wireless Receiver">
-      <button id="2">Close</button>
-      <button id="3">Close</button>
-      <button id="5">Close</button>
-      <button id="9">Close</button>
+      <button id="3">Back</button>
+      <button id="5">Back</button>
+      <button id="9">Back</button>
     </joystick>
   </VisualisationPresetList>
   <SlideShow>
@@ -184,7 +177,6 @@
       <button id="1">NextCalibration</button>
       <button id="3">ResetCalibration</button>
       <button id="6">NextResolution</button>
-      <button id="2">PreviousMenu</button>
     </joystick>
   </ScreenCalibration>
   <GUICalibration>
@@ -192,19 +184,11 @@
       <button id="1">NextCalibration</button>
       <button id="3">ResetCalibration</button>
       <button id="6">NextResolution</button>
-      <button id="2">PreviousMenu</button>
     </joystick>
   </GUICalibration>
-  <SelectDialog>
-    <joystick name="Xbox 360 Wireless Receiver">
-      <button id="17">Close</button>
-    </joystick>
-  </SelectDialog>
   <VideoOSD>
     <joystick name="Xbox 360 Wireless Receiver">
-      <button id="9">Close</button>
-      <button id="17">PreviousMenu</button>
-      <button id="2">PreviousMenu</button>
+      <button id="9">Back</button>
     </joystick>
   </VideoOSD>
   <VideoMenu>
@@ -212,7 +196,6 @@
       <button id="5">AspectRatio</button>
       <button id="2">Stop</button>
       <button id="9">OSD</button>
-      <button id="17">PreviousMenu</button>
       <button id="6">Info</button>
       <button id="3">CodecInfo</button>
     </joystick>
@@ -221,27 +204,21 @@
     <joystick name="Xbox 360 Wireless Receiver">
       <button id="4"/>
       <button id="5">AspectRatio</button>
-      <button id="2">Close</button>
-      <button id="17">Close</button>
-      <button id="19">Close</button>
+      <button id="19">Back</button>
     </joystick>
   </OSDVideoSettings>
   <OSDAudioSettings>
     <joystick name="Xbox 360 Wireless Receiver">
       <button id="4"/>
       <button id="5">AspectRatio</button>
-      <button id="2">Close</button>
-      <button id="17">Close</button>
-      <button id="19">Close</button>
+      <button id="19">Back</button>
     </joystick>
   </OSDAudioSettings>
   <VideoBookmarks>
     <joystick name="Xbox 360 Wireless Receiver">
       <button id="4"/>
       <button id="5">Delete</button>
-      <button id="2">Close</button>
-      <button id="17">Close</button>
-      <button id="19">Close</button>
+      <button id="19">Back</button>
     </joystick>
   </VideoBookmarks>
   <MyVideoLibrary>
@@ -258,9 +235,7 @@
   <MyVideoPlaylist>
     <joystick name="Xbox 360 Wireless Receiver">
       <button id="5">Delete</button>
-      <button id="3">Playlist</button>
-      <button id="17">Playlist</button>
-      <button id="2">Playlist</button>
+      <button id="3">Back</button>
     </joystick>
   </MyVideoPlaylist>
   <VirtualKeyboard>
@@ -273,8 +248,7 @@
   </VirtualKeyboard>
   <ContextMenu>
     <joystick name="Xbox 360 Wireless Receiver">
-      <button id="6">Close</button>
-      <button id="2">Close</button>
+      <button id="6">Back</button>
     </joystick>
   </ContextMenu>
   <Scripts>
@@ -293,113 +267,14 @@
       <button id="9">Stop</button>      <!-- Enter Password -->
     </joystick>
   </GamepadInput>
-  <Weather>
-    <joystick name="Xbox 360 Wireless Receiver">
-      <button id="2">PreviousMenu</button>
-    </joystick>
-  </Weather>
-  <Settings>
-    <joystick name="Xbox 360 Wireless Receiver">
-      <button id="2">PreviousMenu</button>
-    </joystick>
-  </Settings>
-  <AddonInformation>
-    <joystick name="Xbox 360 Wireless Receiver">
-      <button id="2">Close</button>
-    </joystick>
-  </AddonInformation>
-  <AddonSettings>
-    <joystick name="Xbox 360 Wireless Receiver">
-      <button id="2">Close</button>
-    </joystick>
-  </AddonSettings>
-  <TextViewer>
-    <joystick name="Xbox 360 Wireless Receiver">
-      <button id="2">Close</button>
-    </joystick>
-  </TextViewer>
-  <MyPicturesSettings>
-    <joystick name="Xbox 360 Wireless Receiver">
-      <button id="2">PreviousMenu</button>
-    </joystick>
-  </MyPicturesSettings>
-  <MyProgramsSettings>
-    <joystick name="Xbox 360 Wireless Receiver">
-      <button id="2">PreviousMenu</button>
-    </joystick>
-  </MyProgramsSettings>
-  <MyWeatherSettings>
-    <joystick name="Xbox 360 Wireless Receiver">
-      <button id="2">PreviousMenu</button>
-    </joystick>
-  </MyWeatherSettings>
-  <MyMusicSettings>
-    <joystick name="Xbox 360 Wireless Receiver">
-      <button id="2">PreviousMenu</button>
-    </joystick>
-  </MyMusicSettings>
-  <SystemSettings>
-    <joystick name="Xbox 360 Wireless Receiver">
-      <button id="2">PreviousMenu</button>
-    </joystick>
-  </SystemSettings>
-  <MyVideosSettings>
-    <joystick name="Xbox 360 Wireless Receiver">
-      <button id="2">PreviousMenu</button>
-    </joystick>
-  </MyVideosSettings>
-  <NetworkSettings>
-    <joystick name="Xbox 360 Wireless Receiver">
-      <button id="2">PreviousMenu</button>
-    </joystick>
-  </NetworkSettings>
-  <AppearanceSettings>
-    <joystick name="Xbox 360 Wireless Receiver">
-      <button id="2">PreviousMenu</button>
-    </joystick>
-  </AppearanceSettings>
-  <Profiles>
-    <joystick name="Xbox 360 Wireless Receiver">
-      <button id="2">PreviousMenu</button>
-    </joystick>
-  </Profiles>
-  <systeminfo>
-    <joystick name="Xbox 360 Wireless Receiver">
-      <button id="2">PreviousMenu</button>
-    </joystick>
-  </systeminfo>
-  <shutdownmenu>
-    <joystick name="Xbox 360 Wireless Receiver">
-      <button id="2">PreviousMenu</button>
-    </joystick>
-  </shutdownmenu>
-  <submenu>
-    <joystick name="Xbox 360 Wireless Receiver">
-      <button id="2">PreviousMenu</button>
-    </joystick>
-  </submenu>
-  <MusicInformation>
-    <joystick name="Xbox 360 Wireless Receiver">
-      <button id="2">Close</button>
-    </joystick>
-  </MusicInformation>
-  <MovieInformation>
-    <joystick name="Xbox 360 Wireless Receiver">
-      <button id="2">Close</button>
-    </joystick>
-  </MovieInformation>
   <LockSettings>
     <joystick name="Xbox 360 Wireless Receiver">
-      <button id="9">Close</button>
-      <button id="2">PreviousMenu</button>
-      <button id="17">PreviousMenu</button>
+      <button id="9">Back</button>
     </joystick>
   </LockSettings>
   <ProfileSettings>
     <joystick name="Xbox 360 Wireless Receiver">
-      <button id="9">Close</button>
-      <button id="2">PreviousMenu</button>
-      <button id="17">PreviousMenu</button>
+      <button id="9">Back</button>
     </joystick>
   </ProfileSettings>
 </keymap>
diff --git a/system/keymaps/joystick.Microsoft.Xbox.Controller.S.xml b/system/keymaps/joystick.Microsoft.Xbox.Controller.S.xml
index 5902566d4a..a9b1bfc91b 100644
--- a/system/keymaps/joystick.Microsoft.Xbox.Controller.S.xml
+++ b/system/keymaps/joystick.Microsoft.Xbox.Controller.S.xml
@@ -41,7 +41,7 @@
       <altname>Logitech Xbox Cordless Controller</altname>
       <altname>Microsoft X-Box pad (Japan)</altname> 
       <button id="1">Select</button>
-      <button id="2">ParentDir</button>
+      <button id="2">Back</button>
       <button id="3"/>
       <button id="4">FullScreen</button>
       <button id="5">Queue</button>
@@ -86,9 +86,7 @@
       <altname>Mad Catz MicroCON</altname>
       <altname>Logitech Xbox Cordless Controller</altname>
       <altname>Microsoft X-Box pad (Japan)</altname> 
-      <button id="2">Playlist</button>
-      <button id="3">Playlist</button>
-      <button id="17">Playlist</button>
+      <button id="3">Back</button>
       <button id="5">Delete</button>
     </joystick>
   </MyMusicPlaylist>
@@ -135,9 +133,8 @@
       <altname>Mad Catz MicroCON</altname>
       <altname>Logitech Xbox Cordless Controller</altname>
       <altname>Microsoft X-Box pad (Japan)</altname> 
-      <button id="2">Close</button>
       <button id="3">CodecInfo</button>
-      <button id="6">Close</button>
+      <button id="6">Back</button>
       <button id="9">OSD</button>
       <axis limit="0" id="3">AnalogRewind</axis>
       <axis limit="0" id="6">AnalogFastForward</axis>
@@ -148,8 +145,7 @@
       <altname>Mad Catz MicroCON</altname>
       <altname>Logitech Xbox Cordless Controller</altname>
       <altname>Microsoft X-Box pad (Japan)</altname> 
-      <button id="9">Close</button>
-      <button id="17">Close</button>
+      <button id="9">Back</button>
     </joystick>
   </PlayerControls>
   <Visualisation>
@@ -176,8 +172,7 @@
       <altname>Mad Catz MicroCON</altname>
       <altname>Logitech Xbox Cordless Controller</altname>
       <altname>Microsoft X-Box pad (Japan)</altname> 
-      <button id="17">Close</button>
-      <button id="19">Close</button>
+      <button id="19">Back</button>
       <button id="3">CodecInfo</button>
       <button id="6">Info</button>
     </joystick>
@@ -187,9 +182,8 @@
       <altname>Mad Catz MicroCON</altname>
       <altname>Logitech Xbox Cordless Controller</altname>
       <altname>Microsoft X-Box pad (Japan)</altname> 
-      <button id="2">Close</button>
-      <button id="3">Close</button>
-      <button id="9">Close</button>
+      <button id="3">Back</button>
+      <button id="9">Back</button>
     </joystick>
   </VisualisationSettings>
   <VisualisationPresetList>
@@ -197,10 +191,9 @@
       <altname>Mad Catz MicroCON</altname>
       <altname>Logitech Xbox Cordless Controller</altname>
       <altname>Microsoft X-Box pad (Japan)</altname> 
-      <button id="2">Close</button>
-      <button id="3">Close</button>
-      <button id="5">Close</button>
-      <button id="9">Close</button>
+      <button id="3">Back</button>
+      <button id="5">Back</button>
+      <button id="9">Back</button>
     </joystick>
   </VisualisationPresetList>
   <SlideShow>
@@ -229,7 +222,6 @@
       <button id="1">NextCalibration</button>
       <button id="3">ResetCalibration</button>
       <button id="6">NextResolution</button>
-      <button id="2">PreviousMenu</button>
     </joystick>
   </ScreenCalibration>
   <GUICalibration>
@@ -240,25 +232,14 @@
       <button id="1">NextCalibration</button>
       <button id="3">ResetCalibration</button>
       <button id="6">NextResolution</button>
-      <button id="2">PreviousMenu</button>
     </joystick>
   </GUICalibration>
-  <SelectDialog>
-    <joystick name="Microsoft Xbox Controller S">
-      <altname>Mad Catz MicroCON</altname>
-      <altname>Logitech Xbox Cordless Controller</altname>
-      <altname>Microsoft X-Box pad (Japan)</altname> 
-      <button id="17">Close</button>
-    </joystick>
-  </SelectDialog>
   <VideoOSD>
     <joystick name="Microsoft Xbox Controller S">
       <altname>Mad Catz MicroCON</altname>
       <altname>Logitech Xbox Cordless Controller</altname>
       <altname>Microsoft X-Box pad (Japan)</altname> 
-      <button id="9">Close</button>
-      <button id="17">PreviousMenu</button>
-      <button id="2">PreviousMenu</button>
+      <button id="9">Back</button>
     </joystick>
   </VideoOSD>
   <VideoMenu>
@@ -269,7 +250,6 @@
       <button id="5">AspectRatio</button>
       <button id="2">Stop</button>
       <button id="9">OSD</button>
-      <button id="17">PreviousMenu</button>
       <button id="6">Info</button>
       <button id="3">CodecInfo</button>
     </joystick>
@@ -281,9 +261,7 @@
       <altname>Microsoft X-Box pad (Japan)</altname> 
       <button id="4"/>
       <button id="5">AspectRatio</button>
-      <button id="2">Close</button>
-      <button id="17">Close</button>
-      <button id="19">Close</button>
+      <button id="19">Back</button>
     </joystick>
   </OSDVideoSettings>
   <OSDAudioSettings>
@@ -293,9 +271,7 @@
       <altname>Microsoft X-Box pad (Japan)</altname> 
       <button id="4"/>
       <button id="5">AspectRatio</button>
-      <button id="2">Close</button>
-      <button id="17">Close</button>
-      <button id="19">Close</button>
+      <button id="19">Back</button>
     </joystick>
   </OSDAudioSettings>
   <VideoBookmarks>
@@ -305,9 +281,7 @@
       <altname>Microsoft X-Box pad (Japan)</altname> 
       <button id="4"/>
       <button id="5">Delete</button>
-      <button id="2">Close</button>
-      <button id="17">Close</button>
-      <button id="19">Close</button>
+      <button id="19">Back</button>
     </joystick>
   </VideoBookmarks>
   <MyVideoLibrary>
@@ -333,9 +307,7 @@
       <altname>Logitech Xbox Cordless Controller</altname>
       <altname>Microsoft X-Box pad (Japan)</altname> 
       <button id="5">Delete</button>
-      <button id="3">Playlist</button>
-      <button id="17">Playlist</button>
-      <button id="2">Playlist</button>
+      <button id="3">Back</button>
     </joystick>
   </MyVideoPlaylist>
   <VirtualKeyboard>
@@ -354,8 +326,7 @@
       <altname>Mad Catz MicroCON</altname>
       <altname>Logitech Xbox Cordless Controller</altname>
       <altname>Microsoft X-Box pad (Japan)</altname> 
-      <button id="6">Close</button>
-      <button id="2">Close</button>
+      <button id="6">Back</button>
     </joystick>
   </ContextMenu>
   <Scripts>
@@ -383,166 +354,12 @@
       <button id="9">Stop</button>      <!-- Enter Password -->
     </joystick>
   </GamepadInput>
-  <Weather>
-    <joystick name="Microsoft Xbox Controller S">
-      <altname>Mad Catz MicroCON</altname>
-      <altname>Logitech Xbox Cordless Controller</altname>
-      <altname>Microsoft X-Box pad (Japan)</altname> 
-      <button id="2">PreviousMenu</button>
-    </joystick>
-  </Weather>
-  <Settings>
-    <joystick name="Microsoft Xbox Controller S">
-      <altname>Mad Catz MicroCON</altname>
-      <altname>Logitech Xbox Cordless Controller</altname>
-      <altname>Microsoft X-Box pad (Japan)</altname> 
-      <button id="2">PreviousMenu</button>
-    </joystick>
-  </Settings>
-  <AddonInformation>
-    <joystick name="Microsoft Xbox Controller S">
-      <altname>Mad Catz MicroCON</altname>
-      <altname>Logitech Xbox Cordless Controller</altname>
-      <altname>Microsoft X-Box pad (Japan)</altname> 
-      <button id="2">Close</button>
-    </joystick>
-  </AddonInformation>
-  <AddonSettings>
-    <joystick name="Microsoft Xbox Controller S">
-      <altname>Mad Catz MicroCON</altname>
-      <altname>Logitech Xbox Cordless Controller</altname>
-      <altname>Microsoft X-Box pad (Japan)</altname> 
-      <button id="2">Close</button>
-    </joystick>
-  </AddonSettings>
-  <TextViewer>
-    <joystick name="Microsoft Xbox Controller S">
-      <altname>Mad Catz MicroCON</altname>
-      <altname>Logitech Xbox Cordless Controller</altname>
-      <altname>Microsoft X-Box pad (Japan)</altname> 
-      <button id="2">Close</button>
-    </joystick>
-  </TextViewer>
-  <MyPicturesSettings>
-    <joystick name="Microsoft Xbox Controller S">
-      <altname>Mad Catz MicroCON</altname>
-      <altname>Logitech Xbox Cordless Controller</altname>
-      <altname>Microsoft X-Box pad (Japan)</altname> 
-      <button id="2">PreviousMenu</button>
-    </joystick>
-  </MyPicturesSettings>
-  <MyProgramsSettings>
-    <joystick name="Microsoft Xbox Controller S">
-      <altname>Mad Catz MicroCON</altname>
-      <altname>Logitech Xbox Cordless Controller</altname>
-      <altname>Microsoft X-Box pad (Japan)</altname> 
-      <button id="2">PreviousMenu</button>
-    </joystick>
-  </MyProgramsSettings>
-  <MyWeatherSettings>
-    <joystick name="Microsoft Xbox Controller S">
-      <altname>Mad Catz MicroCON</altname>
-      <altname>Logitech Xbox Cordless Controller</altname>
-      <altname>Microsoft X-Box pad (Japan)</altname> 
-      <button id="2">PreviousMenu</button>
-    </joystick>
-  </MyWeatherSettings>
-  <MyMusicSettings>
-    <joystick name="Microsoft Xbox Controller S">
-      <altname>Mad Catz MicroCON</altname>
-      <altname>Logitech Xbox Cordless Controller</altname>
-      <altname>Microsoft X-Box pad (Japan)</altname> 
-      <button id="2">PreviousMenu</button>
-    </joystick>
-  </MyMusicSettings>
-  <SystemSettings>
-    <joystick name="Microsoft Xbox Controller S">
-      <altname>Mad Catz MicroCON</altname>
-      <altname>Logitech Xbox Cordless Controller</altname>
-      <altname>Microsoft X-Box pad (Japan)</altname> 
-      <button id="2">PreviousMenu</button>
-    </joystick>
-  </SystemSettings>
-  <MyVideosSettings>
-    <joystick name="Microsoft Xbox Controller S">
-      <altname>Mad Catz MicroCON</altname>
-      <altname>Logitech Xbox Cordless Controller</altname>
-      <altname>Microsoft X-Box pad (Japan)</altname> 
-      <button id="2">PreviousMenu</button>
-    </joystick>
-  </MyVideosSettings>
-  <NetworkSettings>
-    <joystick name="Microsoft Xbox Controller S">
-      <altname>Mad Catz MicroCON</altname>
-      <altname>Logitech Xbox Cordless Controller</altname>
-      <altname>Microsoft X-Box pad (Japan)</altname> 
-      <button id="2">PreviousMenu</button>
-    </joystick>
-  </NetworkSettings>
-  <AppearanceSettings>
-    <joystick name="Microsoft Xbox Controller S">
-      <altname>Mad Catz MicroCON</altname>
-      <altname>Logitech Xbox Cordless Controller</altname>
-      <altname>Microsoft X-Box pad (Japan)</altname> 
-      <button id="2">PreviousMenu</button>
-    </joystick>
-  </AppearanceSettings>
-  <Profiles>
-    <joystick name="Microsoft Xbox Controller S">
-      <altname>Mad Catz MicroCON</altname>
-      <altname>Logitech Xbox Cordless Controller</altname>
-      <altname>Microsoft X-Box pad (Japan)</altname> 
-      <button id="2">PreviousMenu</button>
-    </joystick>
-  </Profiles>
-  <systeminfo>
-    <joystick name="Microsoft Xbox Controller S">
-      <altname>Mad Catz MicroCON</altname>
-      <altname>Logitech Xbox Cordless Controller</altname>
-      <altname>Microsoft X-Box pad (Japan)</altname> 
-      <button id="2">PreviousMenu</button>
-    </joystick>
-  </systeminfo>
-  <shutdownmenu>
-    <joystick name="Microsoft Xbox Controller S">
-      <altname>Mad Catz MicroCON</altname>
-      <altname>Logitech Xbox Cordless Controller</altname>
-      <altname>Microsoft X-Box pad (Japan)</altname> 
-      <button id="2">PreviousMenu</button>
-    </joystick>
-  </shutdownmenu>
-  <submenu>
-    <joystick name="Microsoft Xbox Controller S">
-      <altname>Mad Catz MicroCON</altname>
-      <altname>Logitech Xbox Cordless Controller</altname>
-      <altname>Microsoft X-Box pad (Japan)</altname> 
-      <button id="2">PreviousMenu</button>
-    </joystick>
-  </submenu>
-  <MusicInformation>
-    <joystick name="Microsoft Xbox Controller S">
-      <altname>Mad Catz MicroCON</altname>
-      <altname>Logitech Xbox Cordless Controller</altname>
-      <altname>Microsoft X-Box pad (Japan)</altname> 
-      <button id="2">Close</button>
-    </joystick>
-  </MusicInformation>
-  <MovieInformation>
-    <joystick name="Microsoft Xbox Controller S">
-      <altname>Mad Catz MicroCON</altname>
-      <altname>Logitech Xbox Cordless Controller</altname>
-      <altname>Microsoft X-Box pad (Japan)</altname> 
-      <button id="2">Close</button>
-    </joystick>
-  </MovieInformation>
   <LockSettings>
     <joystick name="Microsoft Xbox Controller S">
       <altname>Mad Catz MicroCON</altname>
       <altname>Logitech Xbox Cordless Controller</altname>
       <altname>Microsoft X-Box pad (Japan)</altname> 
-      <button id="9">Close</button>
-      <button id="2">PreviousMenu</button>
-      <button id="17">PreviousMenu</button>
+      <button id="9">Back</button>
     </joystick>
   </LockSettings>
   <ProfileSettings>
@@ -550,9 +367,7 @@
       <altname>Mad Catz MicroCON</altname>
       <altname>Logitech Xbox Cordless Controller</altname>
       <altname>Microsoft X-Box pad (Japan)</altname> 
-      <button id="9">Close</button>
-      <button id="2">PreviousMenu</button>
-      <button id="17">PreviousMenu</button>
+      <button id="9">Back</button>
     </joystick>
   </ProfileSettings>
 </keymap>
diff --git a/system/keymaps/joystick.PS3.Remote.Keyboard.xml b/system/keymaps/joystick.PS3.Remote.Keyboard.xml
index 2506c8635f..0cccbebb1d 100644
--- a/system/keymaps/joystick.PS3.Remote.Keyboard.xml
+++ b/system/keymaps/joystick.PS3.Remote.Keyboard.xml
@@ -41,7 +41,7 @@
       <altname>MoSart PS3 Remote Keyboard</altname>
       <button id="1">Info</button>
       <button id="2">Select</button>
-      <button id="3">ParentDir</button>
+      <button id="3">Back</button>
       <button id="4">ContextMenu</button>
       <button id="5">SkipPrevious</button>
       <button id="6">SkipNext</button>
@@ -82,19 +82,10 @@
     <joystick name="PLAYSTATION(R)3 Remote Keyboard">
       <altname>PS3 Remote Keyboard</altname>
       <altname>MoSart PS3 Remote Keyboard</altname>
-      <button id="4">Close</button>
-      <button id="3">Close</button>
+      <button id="4">Back</button>
     </joystick>
   </MusicOSD>
 
-  <FullscreenInfo>
-    <joystick name="PLAYSTATION(R)3 Remote Keyboard">
-      <altname>PS3 Remote Keyboard</altname>
-      <altname>MoSart PS3 Remote Keyboard</altname>
-      <button id="3">Close</button>
-    </joystick>
-  </FullscreenInfo>
-  
   <FullscreenVideo>
     <joystick name="PLAYSTATION(R)3 Remote Keyboard">
       <altname>PS3 Remote Keyboard</altname>
@@ -116,200 +107,14 @@
       <altname>PS3 Remote Keyboard</altname>
       <altname>MoSart PS3 Remote Keyboard</altname>
       <button id="1">Info</button>
-      <button id="3">Close</button>
       <button id="4">OSD</button>
     </joystick>
   </VideoOSD>
   
-   <OSDVideoSettings>
-    <joystick name="PLAYSTATION(R)3 Remote Keyboard">
-      <altname>PS3 Remote Keyboard</altname>
-      <altname>MoSart PS3 Remote Keyboard</altname>
-      <button id="3">Close</button>
-    </joystick>
-  </OSDVideoSettings>
-  
-  <OSDAudioSettings>
-    <joystick name="PLAYSTATION(R)3 Remote Keyboard">
-      <altname>PS3 Remote Keyboard</altname>
-      <altname>MoSart PS3 Remote Keyboard</altname>
-      <button id="3">Close</button>
-    </joystick>
-  </OSDAudioSettings>
-  
-  <ContextMenu>
-    <joystick name="PLAYSTATION(R)3 Remote Keyboard">
-      <altname>PS3 Remote Keyboard</altname>
-      <altname>MoSart PS3 Remote Keyboard</altname>
-      <button id="3">Close</button>
-    </joystick>
-  </ContextMenu>
-
-  <shutdownmenu>
-    <joystick name="PLAYSTATION(R)3 Remote Keyboard">
-      <altname>PS3 Remote Keyboard</altname>
-      <altname>MoSart PS3 Remote Keyboard</altname>
-      <button id="3">PreviousMenu</button>
-    </joystick>
-  </shutdownmenu>
-  
-  <submenu>
-    <joystick name="PLAYSTATION(R)3 Remote Keyboard">
-      <altname>PS3 Remote Keyboard</altname>
-      <altname>MoSart PS3 Remote Keyboard</altname>
-      <button id="3">PreviousMenu</button>
-    </joystick>
-  </submenu>
-
-    <Settings>
-    <joystick name="PLAYSTATION(R)3 Remote Keyboard">
-      <altname>PS3 Remote Keyboard</altname>
-      <altname>MoSart PS3 Remote Keyboard</altname>
-      <button id="3">PreviousMenu</button>
-    </joystick>
-  </Settings>
-
-  <AddonInformation>
-    <joystick name="PLAYSTATION(R)3 Remote Keyboard">
-      <altname>PS3 Remote Keyboard</altname>
-      <altname>MoSart PS3 Remote Keyboard</altname>
-      <button id="3">Close</button>
-    </joystick>
-  </AddonInformation>
-
-  <AddonSettings>
-    <joystick name="PLAYSTATION(R)3 Remote Keyboard">
-      <altname>PS3 Remote Keyboard</altname>
-      <altname>MoSart PS3 Remote Keyboard</altname>
-      <button id="3">Close</button>
-    </joystick>
-  </AddonSettings>
-
-  <TextViewer>
-    <joystick name="PLAYSTATION(R)3 Remote Keyboard">
-      <altname>PS3 Remote Keyboard</altname>
-      <altname>MoSart PS3 Remote Keyboard</altname>
-      <button id="3">Close</button>
-    </joystick>
-  </TextViewer>
-
-  <MyPicturesSettings>
-    <joystick name="PLAYSTATION(R)3 Remote Keyboard">
-      <altname>PS3 Remote Keyboard</altname>
-      <altname>MoSart PS3 Remote Keyboard</altname>
-      <button id="3">PreviousMenu</button>
-    </joystick>
-  </MyPicturesSettings>
-
-  <MyProgramsSettings>
-    <joystick name="PLAYSTATION(R)3 Remote Keyboard">
-      <altname>PS3 Remote Keyboard</altname>
-      <altname>MoSart PS3 Remote Keyboard</altname>
-      <button id="3">PreviousMenu</button>
-    </joystick>
-  </MyProgramsSettings>
-
-  <MyWeatherSettings>
-    <joystick name="PLAYSTATION(R)3 Remote Keyboard">
-      <altname>PS3 Remote Keyboard</altname>
-      <altname>MoSart PS3 Remote Keyboard</altname>
-      <button id="3">PreviousMenu</button>
-    </joystick>
-  </MyWeatherSettings>
-
-  <MyMusicSettings>
-    <joystick name="PLAYSTATION(R)3 Remote Keyboard">
-      <altname>PS3 Remote Keyboard</altname>
-      <altname>MoSart PS3 Remote Keyboard</altname>
-      <button id="3">PreviousMenu</button>
-    </joystick>
-  </MyMusicSettings>
-
-  <SystemSettings>
-    <joystick name="PLAYSTATION(R)3 Remote Keyboard">
-      <altname>PS3 Remote Keyboard</altname>
-      <altname>MoSart PS3 Remote Keyboard</altname>
-      <button id="3">PreviousMenu</button>
-    </joystick>
-  </SystemSettings>
-
-  <MyVideosSettings>
-    <joystick name="PLAYSTATION(R)3 Remote Keyboard">
-      <altname>PS3 Remote Keyboard</altname>
-      <altname>MoSart PS3 Remote Keyboard</altname>
-      <button id="3">PreviousMenu</button>
-    </joystick>
-  </MyVideosSettings>
-
-  <NetworkSettings>
-    <joystick name="PLAYSTATION(R)3 Remote Keyboard">
-      <altname>PS3 Remote Keyboard</altname>
-      <altname>MoSart PS3 Remote Keyboard</altname>
-      <button id="3">PreviousMenu</button>
-    </joystick>
-  </NetworkSettings>
-
-  <AppearanceSettings>
-    <joystick name="PLAYSTATION(R)3 Remote Keyboard">
-      <altname>PS3 Remote Keyboard</altname>
-      <altname>MoSart PS3 Remote Keyboard</altname>
-      <button id="32">PreviousMenu</button>
-    </joystick>
-  </AppearanceSettings>
-
-  <Profiles>
-    <joystick name="PLAYSTATION(R)3 Remote Keyboard">
-      <altname>PS3 Remote Keyboard</altname>
-      <altname>MoSart PS3 Remote Keyboard</altname>
-      <button id="3">PreviousMenu</button>
-    </joystick>
-  </Profiles>
-
-  <systeminfo>
-    <joystick name="PLAYSTATION(R)3 Remote Keyboard">
-      <altname>PS3 Remote Keyboard</altname>
-      <altname>MoSart PS3 Remote Keyboard</altname>
-      <button id="3">PreviousMenu</button>
-    </joystick>
-  </systeminfo>
-
-  <MusicInformation>
-    <joystick name="PLAYSTATION(R)3 Remote Keyboard">
-      <altname>PS3 Remote Keyboard</altname>
-      <altname>MoSart PS3 Remote Keyboard</altname>
-      <button id="3">Close</button>
-    </joystick>
-  </MusicInformation>
-
-  <MovieInformation>
-    <joystick name="PLAYSTATION(R)3 Remote Keyboard">
-      <altname>PS3 Remote Keyboard</altname>
-      <altname>MoSart PS3 Remote Keyboard</altname>
-      <button id="3">Close</button>
-    </joystick>
-  </MovieInformation>
-
-  <LockSettings>
-    <joystick name="PLAYSTATION(R)3 Remote Keyboard">
-      <altname>PS3 Remote Keyboard</altname>
-      <altname>MoSart PS3 Remote Keyboard</altname>
-      <button id="3">PreviousMenu</button>
-    </joystick>
-  </LockSettings>
-
-  <ProfileSettings>
-    <joystick name="PLAYSTATION(R)3 Remote Keyboard">
-      <altname>PS3 Remote Keyboard</altname>
-      <altname>MoSart PS3 Remote Keyboard</altname>
-      <button id="3">PreviousMenu</button>
-    </joystick>
-  </ProfileSettings>
-
   <PictureInfo>
     <joystick name="PLAYSTATION(R)3 Remote Keyboard">
       <altname>PS3 Remote Keyboard</altname>
       <altname>MoSart PS3 Remote Keyboard</altname>
-      <button id="3">Close</button>
       <hat    id="1" position="left">PreviousPicture</hat>
       <hat    id="1" position="right">NextPicture</hat>
     </joystick>
@@ -319,16 +124,9 @@
     <joystick name="PLAYSTATION(R)3 Remote Keyboard">
       <altname>PS3 Remote Keyboard</altname>
       <altname>MoSart PS3 Remote Keyboard</altname>
-      <button id="1">Close</button>
+      <button id="1">Back</button>
       <button id="4">OSD</button>
     </joystick>
   </FullscreenInfo>
 
-  <NumericInput>
-    <joystick name="PLAYSTATION(R)3 Remote Keyboard">
-      <altname>PS3 Remote Keyboard</altname>
-      <altname>MoSart PS3 Remote Keyboard</altname>
-      <button id="3">Close</button>
-    </joystick>
-  </NumericInput>
 </keymap>
diff --git a/system/keymaps/joystick.Sony.PLAYSTATION(R)3.Controller.xml b/system/keymaps/joystick.Sony.PLAYSTATION(R)3.Controller.xml
index 61ab9d1f2e..018b29a3fb 100644
--- a/system/keymaps/joystick.Sony.PLAYSTATION(R)3.Controller.xml
+++ b/system/keymaps/joystick.Sony.PLAYSTATION(R)3.Controller.xml
@@ -40,7 +40,7 @@
       <altname>PS3 Controller</altname>
       <altname>Sony Computer Entertainment Wireless Controller</altname>
       <button id="15">Select</button>
-      <button id="14">ParentDir</button>
+      <button id="14">Back</button>
       <button id="16">FullScreen</button>
       <button id="13">Queue</button>
       <button id="11">PreviousMenu</button>
diff --git a/system/keymaps/joystick.WiiRemote.xml b/system/keymaps/joystick.WiiRemote.xml
index 21142bab3c..d6fa40927b 100644
--- a/system/keymaps/joystick.WiiRemote.xml
+++ b/system/keymaps/joystick.WiiRemote.xml
@@ -42,7 +42,7 @@
       <button id="3">Left</button>
       <button id="4">Right</button>
       <button id="5">Select</button>
-      <button id="6">PreviousMenu</button>
+      <button id="6">Back</button>
       <button id="7">VolumeDown</button>
       <button id="8">XBMC.ActivateWindow(Home)</button>
       <button id="9">VolumeUp</button>
@@ -59,7 +59,6 @@
   </Home>
   <MyFiles>
     <joystick name="WiiRemote">
-      <button id="6">ParentDir</button>
       <button id="7">Move</button>
       <button id="9">Copy</button>
       <button id="11">Highlight</button>
@@ -67,7 +66,6 @@
   </MyFiles>
   <MyMusicPlaylist>
     <joystick name="WiiRemote">
-      <button id="6">Playlist</button>
       <button id="7">MoveItemUp</button>
       <button id="9">MoveItemDown</button>
       <button id="11">Delete</button>
@@ -75,7 +73,6 @@
   </MyMusicPlaylist>
   <MyMusicPlaylistEditor>
     <joystick name="WiiRemote">
-      <button id="6">Playlist</button>
       <button id="7">MoveItemUp</button>
       <button id="9">MoveItemDown</button>
       <button id="11">Delete</button>
@@ -83,13 +80,11 @@
   </MyMusicPlaylistEditor>
   <MyMusicFiles>
     <joystick name="WiiRemote">
-      <button id="6">ParentDir</button>
       <button id="11">Playlist</button>
     </joystick>
   </MyMusicFiles>
   <MyMusicLibrary>
     <joystick name="WiiRemote">
-      <button id="6">ParentDir</button>
       <button id="11">Playlist</button>
     </joystick>
   </MyMusicLibrary>
@@ -108,14 +103,8 @@
   <FullscreenInfo>
     <joystick name="WiiRemote">
       <button id="5">CodecInfo</button>
-      <button id="6">Close</button>
     </joystick>
   </FullscreenInfo>
-  <PlayerControls>
-    <joystick name="WiiRemote">
-      <button id="6">Close</button>
-    </joystick>
-  </PlayerControls>
   <Visualisation>
     <joystick name="WiiRemote">
       <button id="1">Pause</button>
@@ -131,23 +120,16 @@
   </Visualisation>
   <MusicOSD>
     <joystick name="WiiRemote">
-      <button id="6">Close</button>
       <button id="10">CodecInfo</button>
       <button id="11">Info</button>
     </joystick>
   </MusicOSD>
   <VisualisationSettings>
     <joystick name="WiiRemote">
-      <button id="6">Close</button>
       <button id="10">XBMC.ActivateWindow(VisualisationPresetList)</button>
       <button id="11">XBMC.ActivateWindow(MusicPlaylist)</button>
     </joystick>
   </VisualisationSettings>
-  <VisualisationPresetList>
-    <joystick name="WiiRemote">
-      <button id="6">Close</button>
-    </joystick>
-  </VisualisationPresetList>
   <SlideShow>
     <joystick name="WiiRemote">
       <button id="1">Pause</button>
@@ -167,16 +149,6 @@
       <button id="11">ResetResolution</button>
     </joystick>
   </ScreenCalibration>
-  <SelectDialog>
-    <joystick name="WiiRemote">
-      <button id="6">Close</button>
-    </joystick>
-  </SelectDialog>
-  <VideoOSD>
-    <joystick name="WiiRemote">
-      <button id="6">Close</button>
-    </joystick>
-  </VideoOSD>
   <VideoMenu>
     <joystick name="WiiRemote">
       <button id="5">Select</button>
@@ -184,37 +156,23 @@
       <button id="11">AspectRatio</button>
     </joystick>
   </VideoMenu>
-  <OSDVideoSettings>
-    <joystick name="WiiRemote">
-      <button id="6">Close</button>
-    </joystick>
-  </OSDVideoSettings>
-  <OSDAudioSettings>
-    <joystick name="WiiRemote">
-      <button id="6">Close</button>
-    </joystick>
-  </OSDAudioSettings>
   <VideoBookmarks>
     <joystick name="WiiRemote">
-      <button id="6">Close</button>
       <button id="11">Delete</button>
     </joystick>
   </VideoBookmarks>
   <MyVideoLibrary>
     <joystick name="WiiRemote">
-      <button id="6">ParentDir</button>
       <button id="11">Playlist</button>
     </joystick>
   </MyVideoLibrary>
   <MyVideoFiles>
     <joystick name="WiiRemote">
-      <button id="6">ParentDir</button>
       <button id="11">Playlist</button>
     </joystick>
   </MyVideoFiles>
   <MyVideoPlaylist>
     <joystick name="WiiRemote">
-      <button id="6">Playlist</button>
       <button id="7">MoveItemDown</button>
       <button id="9">MoveItemUp</button>
       <button id="11">Delete</button>
@@ -229,11 +187,6 @@
       <button id="11">BackSpace</button>
     </joystick>
   </VirtualKeyboard>
-  <ContextMenu>
-    <joystick name="WiiRemote">
-      <button id="6">Close</button>
-    </joystick>
-  </ContextMenu>
   <Scripts>
     <joystick name="WiiRemote">
       <button id="11">info</button>
@@ -247,46 +200,10 @@
       <button id="11">BackSpace</button>
     </joystick>
   </NumericInput>
-  <MusicInformation>
-    <joystick name="WiiRemote">
-      <button id="6">Close</button>
-    </joystick>
-  </MusicInformation>
-  <MovieInformation>
-    <joystick name="WiiRemote">
-      <button id="6">Close</button>
-    </joystick>
-  </MovieInformation>
   <PictureInfo>
     <joystick name="WiiRemote">
       <button id="3">PreviousPicture</button>
       <button id="4">NextPicture</button>
-      <button id="6">Close</button>
     </joystick>
   </PictureInfo>
-  <MyPictures>
-    <joystick name="WiiRemote">
-      <button id="6">ParentDir</button>
-    </joystick>
-  </MyPictures>
-  <AddonBrowser>
-    <joystick name="WiiRemote">
-      <button id="6">ParentDir</button>
-    </joystick>
-  </AddonBrowser>
-  <AddonInformation>
-    <joystick name="WiiRemote">
-      <button id="6">Close</button>
-    </joystick>
-  </AddonInformation>
-  <AddonSettings>
-    <joystick name="WiiRemote">
-      <button id="6">Close</button>
-    </joystick>
-  </AddonSettings>
-  <TextViewer>
-    <joystick name="WiiRemote">
-      <button id="6">Close</button>
-    </joystick>
-  </TextViewer>
 </keymap>
diff --git a/system/keymaps/keyboard.nyxboard.xml b/system/keymaps/keyboard.nyxboard.xml
index 7805083e8e..33e9ec8027 100644
--- a/system/keymaps/keyboard.nyxboard.xml
+++ b/system/keymaps/keyboard.nyxboard.xml
@@ -38,7 +38,8 @@
       <pagedown>PageDown</pagedown>
       <return>Select</return>
       <enter>Select</enter>
-      <backspace>ParentDir</backspace>
+      <backspace>Back</backspace>
+      <key id='65446'>Back</key>
       <m>ActivateWindow(PlayerControls)</m>
       <s>ActivateWindow(shutdownmenu)</s>
       <escape>PreviousMenu</escape>
@@ -125,11 +126,10 @@
   </MyFiles>
   <MyMusicPlaylist>
     <keyboard name="Motorola Nyxboard Hybrid">
-      <space>Playlist</space>      <!-- Close playlist -->
+      <space>Back</space>
       <delete>Delete</delete>
       <u>MoveItemUp</u>
       <d>MoveItemDown</d>
-      <backspace>Playlist</backspace>      <!-- Close playlist -->
     </keyboard>
   </MyMusicPlaylist>
   <MyMusicPlaylistEditor>
@@ -190,17 +190,15 @@
       <f>FastForward</f>
       <r>Rewind</r>
       <period>StepForward</period>
-      <backspace>Close</backspace>
       <o>CodecInfo</o>
-      <i>Close</i>
-      <d mod="ctrl">Close</d>
+      <i>Back</i>
+      <d mod="ctrl">Back</d>
       <m>OSD</m>
     </keyboard>
   </FullscreenInfo>
   <PlayerControls>
     <keyboard name="Motorola Nyxboard Hybrid">
-      <escape>Close</escape>
-      <m>close</m>
+      <m>Back</m>
     </keyboard>
   </PlayerControls>
   <Visualisation>
@@ -227,12 +225,11 @@
   </Visualisation>
   <MusicOSD>
     <keyboard name="Motorola Nyxboard Hybrid">
-      <escape>Close</escape>
       <f>FastForward</f>
       <r>Rewind</r>
       <period>SkipNext</period>
       <comma>SkipPrevious</comma>
-      <m>Close</m>
+      <m>Back</m>
       <i>Info</i>
       <o>CodecInfo</o>
       <p>ActivateWindow(VisualisationPresetList)</p>
@@ -242,31 +239,29 @@
   </MusicOSD>
   <VisualisationSettings>
     <keyboard name="Motorola Nyxboard Hybrid">
-      <escape>Close</escape>
       <f>FastForward</f>
       <r>Rewind</r>
       <period>SkipNext</period>
       <comma>SkipPrevious</comma>
-      <m>Close</m>
+      <m>Back</m>
       <i>Info</i>
       <o>CodecInfo</o>
       <p>ActivateWindow(VisualisationPresetList)</p>
-      <v>Close</v>
+      <v>Back</v>
       <n>ActivateWindow(MusicPlaylist)</n>
     </keyboard>
   </VisualisationSettings>
   <VisualisationPresetList>
     <keyboard name="Motorola Nyxboard Hybrid">
-      <escape>Close</escape>
       <f>FastForward</f>
       <r>Rewind</r>
       <period>SkipNext</period>
       <comma>SkipPrevious</comma>
-      <m>Close</m>
+      <m>Back</m>
       <i>Info</i>
       <o>CodecInfo</o>
-      <p>Close</p>
-      <v>Close</v>
+      <p>Back</p>
+      <v>Back</v>
       <n>ActivateWindow(MusicPlaylist)</n>
     </keyboard>
   </VisualisationPresetList>
@@ -289,7 +284,6 @@
       <plus>ZoomIn</plus>
       <minus>ZoomOut</minus>
       <r>Rotate</r>
-      <backspace>PreviousMenu</backspace>
     </keyboard>
   </SlideShow>
   <ScreenCalibration>
@@ -307,18 +301,10 @@
       <d>ResetCalibration</d>
     </keyboard>
   </GUICalibration>
-  <SelectDialog>
-    <keyboard name="Motorola Nyxboard Hybrid">
-      <backspace>Close</backspace>
-      <escape>Close</escape>
-    </keyboard>
-  </SelectDialog>
   <VideoOSD>
     <keyboard name="Motorola Nyxboard Hybrid">
-      <backspace>Close</backspace>
-      <escape>Close</escape>
-      <m>Close</m>
-      <g mod="ctrl">close</g> <!-- MCE Guide button -->
+      <m>Back</m>
+      <g mod="ctrl">Back</g> <!-- MCE Guide button -->
       <i>Info</i>
       <o>CodecInfo</o>
     </keyboard>
@@ -337,29 +323,22 @@
       <escape>Fullscreen</escape>
       <return>Select</return>
       <enter>Select</enter>      <!-- backspace>Fullscreen</backspace -->
-      <backspace>PreviousMenu</backspace>
     </keyboard>
   </VideoMenu>
   <OSDVideoSettings>
     <keyboard name="Motorola Nyxboard Hybrid">
-      <backspace>Close</backspace>
-      <escape>Close</escape>
       <i>Info</i>
       <o>CodecInfo</o>
     </keyboard>
   </OSDVideoSettings>
   <OSDAudioSettings>
     <keyboard name="Motorola Nyxboard Hybrid">
-      <backspace>Close</backspace>
-      <escape>Close</escape>
       <i>Info</i>
       <o>CodecInfo</o>
     </keyboard>
   </OSDAudioSettings>
   <VideoBookmarks>
     <keyboard name="Motorola Nyxboard Hybrid">
-      <backspace>Close</backspace>
-      <escape>Close</escape>
       <delete>Delete</delete>
     </keyboard>
   </VideoBookmarks>
@@ -379,8 +358,7 @@
   </MyVideoFiles>
   <MyVideoPlaylist>
     <keyboard name="Motorola Nyxboard Hybrid">
-      <backspace>Playlist</backspace>      <!-- Close playlist -->
-      <space>Playlist</space>      <!-- Close playlist -->
+      <space>Back</space>
       <delete>Delete</delete>
       <u>MoveItemUp</u>
       <d>MoveItemDown</d>
@@ -393,163 +371,46 @@
   </MyPictures>
   <ContextMenu>
     <keyboard name="Motorola Nyxboard Hybrid">
-      <c>Close</c>
-      <menu>Close</menu>
-      <backspace>Close</backspace>
+      <c>Back</c>
+      <menu>Back</menu>
     </keyboard>
   </ContextMenu>
-  <FileStackingDialog>
-    <keyboard name="Motorola Nyxboard Hybrid">
-      <backspace>Close</backspace>
-    </keyboard>
-  </FileStackingDialog>
   <Scripts>
     <keyboard name="Motorola Nyxboard Hybrid">
       <i>info</i>
     </keyboard>
   </Scripts>
-  <Weather>
-    <keyboard name="Motorola Nyxboard Hybrid">
-      <backspace>PreviousMenu</backspace>
-      <key id='65446'>PreviousMenu</key>
-    </keyboard>
-  </Weather>
-  <Settings>
-    <keyboard name="Motorola Nyxboard Hybrid">
-      <backspace>PreviousMenu</backspace>
-    </keyboard>
-  </Settings>
-  <MyPicturesSettings>
-    <keyboard name="Motorola Nyxboard Hybrid">
-      <backspace>PreviousMenu</backspace>
-    </keyboard>
-  </MyPicturesSettings>
-  <MyProgramsSettings>
-    <keyboard name="Motorola Nyxboard Hybrid">
-      <backspace>PreviousMenu</backspace>
-    </keyboard>
-  </MyProgramsSettings>
-  <MyWeatherSettings>
-    <keyboard name="Motorola Nyxboard Hybrid">
-      <backspace>PreviousMenu</backspace>
-    </keyboard>
-  </MyWeatherSettings>
-  <MyMusicSettings>
-    <keyboard name="Motorola Nyxboard Hybrid">
-      <backspace>PreviousMenu</backspace>
-    </keyboard>
-  </MyMusicSettings>
-  <SystemSettings>
-    <keyboard name="Motorola Nyxboard Hybrid">
-      <backspace>PreviousMenu</backspace>
-    </keyboard>
-  </SystemSettings>
-  <MyVideosSettings>
-    <keyboard name="Motorola Nyxboard Hybrid">
-      <backspace>PreviousMenu</backspace>
-    </keyboard>
-  </MyVideosSettings>
-  <NetworkSettings>
-    <keyboard name="Motorola Nyxboard Hybrid">
-      <backspace>PreviousMenu</backspace>
-    </keyboard>
-  </NetworkSettings>
-  <AppearanceSettings>
-    <keyboard name="Motorola Nyxboard Hybrid">
-      <backspace>PreviousMenu</backspace>
-    </keyboard>
-  </AppearanceSettings>
-  <Profiles>
-    <keyboard name="Motorola Nyxboard Hybrid">
-      <backspace>PreviousMenu</backspace>
-    </keyboard>
-  </Profiles>
-  <systeminfo>
-    <keyboard name="Motorola Nyxboard Hybrid">
-      <backspace>PreviousMenu</backspace>
-    </keyboard>
-  </systeminfo>
   <shutdownmenu>
     <keyboard name="Motorola Nyxboard Hybrid">
-      <backspace>PreviousMenu</backspace>
-      <s>Close</s>  
+      <s>Back</s>  
     </keyboard>
   </shutdownmenu>
-  <submenu>
-    <keyboard name="Motorola Nyxboard Hybrid">
-      <backspace>PreviousMenu</backspace>
-    </keyboard>
-  </submenu>
   <MusicInformation>
     <keyboard name="Motorola Nyxboard Hybrid">
-      <backspace>Close</backspace>
-      <i>Close</i>
-      <d mod="ctrl">Close</d>
-      <key id='65446'>Close</key>
+      <i>Back</i>
+      <d mod="ctrl">Back</d>
     </keyboard>
   </MusicInformation>
   <MovieInformation>
     <keyboard name="Motorola Nyxboard Hybrid">
-      <backspace>Close</backspace>
-      <i>Close</i>
-      <key id='65446'>Close</key>
+      <i>Back</i>
     </keyboard>
   </MovieInformation>
-  <AddonInformation>
-    <keyboard name="Motorola Nyxboard Hybrid">
-      <backspace>Close</backspace>
-    </keyboard>
-  </AddonInformation>
-  <AddonSettings>
-    <keyboard name="Motorola Nyxboard Hybrid">
-      <backspace>Close</backspace>
-    </keyboard>
-  </AddonSettings>
-  <TextViewer>
-    <keyboard name="Motorola Nyxboard Hybrid">
-      <backspace>Close</backspace>
-    </keyboard>
-  </TextViewer>
-  <LockSettings>
-    <keyboard name="Motorola Nyxboard Hybrid">
-      <escape>Close</escape>
-      <backspace>PreviousMenu</backspace>
-    </keyboard>
-  </LockSettings>
-  <ProfileSettings>
-    <keyboard name="Motorola Nyxboard Hybrid">
-      <escape>Close</escape>
-      <backspace>PreviousMenu</backspace>
-    </keyboard>
-  </ProfileSettings>
   <PictureInfo>
     <keyboard name="Motorola Nyxboard Hybrid">
       <period>NextPicture</period>
       <comma>PreviousPicture</comma>
-      <i>Close</i>
-      <d mod="ctrl">Close</d>
-      <o>Close</o>
-      <backspace>Close</backspace>
+      <i>Back</i>
+      <d mod="ctrl">Back</d>
+      <o>Back</o>
       <space>Pause</space>
     </keyboard>
   </PictureInfo>
   <Teletext>
     <keyboard name="Motorola Nyxboard Hybrid">
-      <backspace>Close</backspace>
-      <escape>Close</escape>
-      <v>Close</v>
+      <v>Back</v>
     </keyboard>
   </Teletext>
-  <Favourites>
-    <keyboard name="Motorola Nyxboard Hybrid">
-      <backspace>Close</backspace>
-    </keyboard>
-  </Favourites>
-  <NumericInput>
-    <keyboard name="Motorola Nyxboard Hybrid">
-      <backspace>Close</backspace>
-    </keyboard>
-  </NumericInput>
   <FileBrowser>
     <keyboard name="Motorola Nyxboard Hybrid">
       <space>Highlight</space>
diff --git a/system/keymaps/keyboard.xml b/system/keymaps/keyboard.xml
index 009849c0fc..7572d943d4 100644
--- a/system/keymaps/keyboard.xml
+++ b/system/keymaps/keyboard.xml
@@ -168,7 +168,7 @@
   </MyFiles>
   <MyMusicPlaylist>
     <keyboard>
-      <space>Playlist</space>      <!-- Close playlist -->
+      <space>Back</space>
       <delete>Delete</delete>
       <u>MoveItemUp</u>
       <d>MoveItemDown</d>
@@ -400,7 +400,7 @@
   </MyVideoFiles>
   <MyVideoPlaylist>
     <keyboard>
-      <space>Playlist</space>      <!-- Close playlist -->
+      <space>Back</space>
       <delete>Delete</delete>
       <u>MoveItemUp</u>
       <d>MoveItemDown</d>
diff --git a/system/keymaps/remote.xml b/system/keymaps/remote.xml
index fde69d5f86..a846383541 100644
--- a/system/keymaps/remote.xml
+++ b/system/keymaps/remote.xml
@@ -50,7 +50,7 @@
       <enter>FullScreen</enter> 
       <pageplus>PageUp</pageplus>
       <pageminus>PageDown</pageminus>
-      <back>ParentDir</back>
+      <back>Back</back>
       <menu>PreviousMenu</menu>
       <title>ContextMenu</title>
       <info>Info</info>
@@ -100,7 +100,6 @@
   </MyFiles>
   <MyMusicPlaylist>
     <remote>
-      <back>Playlist</back>      <!-- Close playlist -->
       <clear>Delete</clear>
       <zero>Delete</zero>
     </remote>
@@ -160,13 +159,13 @@
   <FullscreenInfo>
     <remote>
       <title>CodecInfo</title>
-      <info>Close</info>
+      <info>Back</info>
       <menu>OSD</menu>
     </remote>
   </FullscreenInfo>
   <PlayerControls>
     <remote>
-      <menu>Close</menu>
+      <menu>Back</menu>
     </remote>
   </PlayerControls>
   <Visualisation>
@@ -185,21 +184,19 @@
   </Visualisation>
   <MusicOSD>
     <remote>
-      <menu>Close</menu>
+      <menu>Back</menu>
       <title>Info</title>
       <info>CodecInfo</info>
     </remote>
   </MusicOSD>
   <VisualisationSettings>
     <remote>
-      <menu>Close</menu>
-      <back>Close</back>
+      <menu>Back</menu>
     </remote>
   </VisualisationSettings>
   <VisualisationPresetList>
     <remote>
-      <menu>Close</menu>
-      <back>Close</back>
+      <menu>Back</menu>
     </remote>
   </VisualisationPresetList>
   <SlideShow>
@@ -219,7 +216,6 @@
       <skipminus>PreviousPicture</skipminus>
       <title>Info</title>
       <select>Rotate</select>
-      <back>PreviousMenu</back>
     </remote>
   </SlideShow>
   <ScreenCalibration>
@@ -236,22 +232,15 @@
       <zero>ResetCalibration</zero>
     </remote>
   </GUICalibration>
-  <SelectDialog>
-    <remote>
-      <back>Close</back>
-    </remote>
-  </SelectDialog>
   <VideoOSD>
     <remote>
-      <back>PreviousMenu</back>
-      <menu>Close</menu>
-      <start>Close</start>
+      <menu>Back</menu>
+      <start>Back</start>
     </remote>
   </VideoOSD>
   <VideoMenu>
     <remote>
       <menu>OSD</menu>
-      <back>PreviousMenu</back>
       <info>Info</info>
       <title>CodecInfo</title>
       <zero>Number0</zero>
@@ -269,23 +258,20 @@
   </VideoMenu>
   <OSDVideoSettings>
     <remote>
-      <back>Close</back>
-      <menu>Close</menu>
-      <start>Close</start>
+      <menu>Back</menu>
+      <start>Back</start>
     </remote>
   </OSDVideoSettings>
   <OSDAudioSettings>
     <remote>
-      <back>Close</back>
-      <menu>Close</menu>
-      <start>Close</start>
+      <menu>Back</menu>
+      <start>Back</start>
     </remote>
   </OSDAudioSettings>
   <VideoBookmarks>
     <remote>
-      <back>Close</back>
-      <menu>Close</menu>
-      <start>Close</start>
+      <menu>Back</menu>
+      <start>Back</start>
       <zero>Delete</zero>
     </remote>
   </VideoBookmarks>
@@ -303,7 +289,6 @@
   </MyVideoFiles>
   <MyVideoPlaylist>
     <remote>
-      <back>Playlist</back>      <!-- Close playlist -->
       <clear>Delete</clear>
       <zero>Delete</zero>
     </remote>
@@ -330,15 +315,9 @@
   </VirtualKeyboard>
   <ContextMenu>
     <remote>
-      <title>Close</title>
-      <back>Close</back>
+      <title>Back</title>
     </remote>
   </ContextMenu>
-  <FileStackingDialog>
-    <remote>
-      <back>Close</back>
-    </remote>
-  </FileStackingDialog>
   <Scripts>
     <remote>
       <info>info</info>
@@ -360,125 +339,31 @@
       <back>BackSpace</back>
     </remote>
   </NumericInput>
-  <Weather>
-    <remote>
-      <back>PreviousMenu</back>
-    </remote>
-  </Weather>
-  <Settings>
-    <remote>
-      <back>PreviousMenu</back>
-    </remote>
-  </Settings>
-  <AddonBrowser>
-    <remote>
-    </remote>
-  </AddonBrowser>
-  <AddonInformation>
-    <remote>
-      <back>Close</back>
-    </remote>
-  </AddonInformation>
-  <AddonSettings>
-    <remote>
-      <back>Close</back>
-    </remote>
-  </AddonSettings>
-  <TextViewer>
-    <remote>
-      <back>Close</back>
-    </remote>
-  </TextViewer>
-  <MyPicturesSettings>
-    <remote>
-      <back>PreviousMenu</back>
-    </remote>
-  </MyPicturesSettings>
-  <MyProgramsSettings>
-    <remote>
-      <back>PreviousMenu</back>
-    </remote>
-  </MyProgramsSettings>
-  <MyWeatherSettings>
-    <remote>
-      <back>PreviousMenu</back>
-    </remote>
-  </MyWeatherSettings>
-  <MyMusicSettings>
-    <remote>
-      <back>PreviousMenu</back>
-    </remote>
-  </MyMusicSettings>
-  <SystemSettings>
-    <remote>
-      <back>PreviousMenu</back>
-    </remote>
-  </SystemSettings>
-  <MyVideosSettings>
-    <remote>
-      <back>PreviousMenu</back>
-    </remote>
-  </MyVideosSettings>
-  <NetworkSettings>
-    <remote>
-      <back>PreviousMenu</back>
-    </remote>
-  </NetworkSettings>
-  <AppearanceSettings>
-    <remote>
-      <back>PreviousMenu</back>
-    </remote>
-  </AppearanceSettings>
-  <Profiles>
-    <remote>
-      <back>PreviousMenu</back>
-    </remote>
-  </Profiles>
-  <systeminfo>
-    <remote>
-      <back>PreviousMenu</back>
-    </remote>
-  </systeminfo>
-  <shutdownmenu>
-    <remote>
-      <back>PreviousMenu</back>
-    </remote>
-  </shutdownmenu>
-  <submenu>
-    <remote>
-      <back>PreviousMenu</back>
-    </remote>
-  </submenu>
   <MusicInformation>
     <remote>
-      <back>Close</back>
-      <info>Close</info>
+      <info>Back</info>
     </remote>
   </MusicInformation>
   <MovieInformation>
     <remote>
-      <info>Close</info>
-      <back>Close</back>
+      <info>Back</info>
     </remote>
   </MovieInformation>
   <LockSettings>
     <remote>
-      <menu>Close</menu>
-      <back>PreviousMenu</back>
+      <menu>Back</menu>
     </remote>
   </LockSettings>
   <ProfileSettings>
     <remote>
-      <menu>Close</menu>
-      <back>PreviousMenu</back>
+      <menu>Back</menu>
     </remote>
   </ProfileSettings>
   <PictureInfo>
     <remote>
       <skipplus>NextPicture</skipplus>
       <skipminus>PreviousPicture</skipminus>
-      <info>Close</info>
-      <back>Close</back>
+      <info>Back</info>
     </remote>
   </PictureInfo>
   <Teletext>
@@ -498,15 +383,9 @@
       <yellow>Yellow</yellow>
       <blue>Blue</blue>
       <info>Info</info>
-      <back>Close</back>
-      <menu>Close</menu>
-      <start>Close</start>
-      <teletext>Close</teletext>
+      <menu>Back</menu>
+      <start>Back</start>
+      <teletext>Back</teletext>
     </remote>
   </Teletext>
-  <Favourites>
-    <remote>
-      <back>Close</back>
-    </remote>
-  </Favourites>
 </keymap>
-- 
cgit v1.2.3