David Teirney

--- system/keymaps/joystick.WiiRemote.xml
+++ system/keymaps/joystick.WiiRemote.xml
@@ -44,71 +44,74 @@
       <button id="4">Right</button>
       <button id="5">Select</button>
       <button id="6">PreviousMenu</button>
-      <button id="7">VolumeDown</button>
+      <button id="7">PageUp</button>
       <button id="8">XBMC.ActivateWindow(Home)</button>
-      <button id="9">VolumeUp</button>
+      <button id="9">PageDown</button>
       <button id="10">ContextMenu</button>
       <button id="11">XBMC.ActivateWindow(PlayerControls)</button>
     </joystick>
   </global>
   <Home>
     <joystick name="WiiRemote">
-      <button id="8">Fullscreen</button>
+      <button id="7">VolumeDown</button>
+      <button id="9">VolumeUp</button>
       <button id="10">XBMC.ActivateWindow(Favourites)</button>
       <button id="11">XBMC.ActivateWindow(ShutdownMenu)</button>
     </joystick>
   </Home>
   <MyFiles>
     <joystick name="WiiRemote">
-      <button id="7">Move</button>
-      <button id="9">Copy</button>
-      <button id="11">Highlight</button>
+      <button id="11">Delete</button>
     </joystick>
   </MyFiles>
   <MyMusicPlaylist>
+    <joystick name="WiiRemote">
+      <button id="6">Playlist</button>
+      <button id="7">MoveItemDown</button>
+      <button id="9">MoveItemUp</button>
+      <button id="11">Delete</button>
+    </joystick>
+  </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>
     </joystick>
-  </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>
-    </joystick>
   </MyMusicPlaylistEditor>
   <MyMusicFiles>
     <joystick name="WiiRemote">
       <button id="6">ParentDir</button>
-      <button id="11">Playlist</button>
+      <button id="11">Delete</button>
     </joystick>
   </MyMusicFiles>
   <MyMusicLibrary>
     <joystick name="WiiRemote">
       <button id="6">ParentDir</button>
-      <button id="11">Playlist</button>
+      <button id="11">Delete</button>
     </joystick>
   </MyMusicLibrary>
   <FullscreenVideo>
     <joystick name="WiiRemote">
-      <button id="1">Pause</button>
-      <button id="2">Stop</button>
+      <button id="1">BigStepForward</button>
+      <button id="2">BigStepBack</button>
       <button id="3">StepBack</button>
       <button id="4">StepForward</button>
-      <button id="5">OSD</button>
-      <button id="6">Info</button>
-      <button id="10">CodecInfo</button>
+      <button id="5">Pause</button>
+      <button id="6">Stop</button>
+      <button id="7">VolumeDown</button>
+      <button id="9">VolumeUp</button>
+      <button id="10">OSD</button>
       <button id="11">AspectRatio</button>
+      <button id="33">AnalogSeekBack</button>
+      <button id="34">AnalogSeekForward</button>
     </joystick>
   </FullscreenVideo>
   <FullscreenInfo>
     <joystick name="WiiRemote">
-      <button id="5">CodecInfo</button>
-      <button id="6">Close</button>
+      <button id="6">Close</button>
+      <button id="10">CodecInfo</button>
     </joystick>
   </FullscreenInfo>
   <PlayerControls>
@@ -118,28 +121,26 @@
   </PlayerControls>
   <Visualisation>
     <joystick name="WiiRemote">
-      <button id="1">Pause</button>
-      <button id="2">Stop</button>
-      <button id="3">SkipNext</button>
-      <button id="4">SkipPrevious</button>
+      <button id="1">PreviousPreset</button>
+      <button id="2">NextPreset</button>
+      <button id="3">SkipPrevious</button>
+      <button id="4">SkipNext</button>
       <button id="5">XBMC.ActivateWindow(MusicOSD)</button>
-      <button id="6">Info</button>
-      <button id="10">IncreaseRating</button>
-      <button id="11">DecreaseRating</button>
+      <button id="6">Stop</button>
+      <button id="7">VolumeDown</button>
+      <button id="9">VolumeUp</button>
+      <button id="10">Info</button>
     </joystick>
   </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>
@@ -149,21 +150,19 @@
   </VisualisationPresetList>
   <SlideShow>
     <joystick name="WiiRemote">
-      <button id="1">Pause</button>
-      <button id="2">Stop</button>
       <button id="3">PreviousPicture</button>
       <button id="4">NextPicture</button>
-      <button id="5">CodecInfo</button>
-      <button id="6">Info</button>
-      <button id="10">ZoomIn</button>
-      <button id="11">ZoomOut</button>
+      <button id="5">Pause</button>
+      <button id="6">Stop</button>
+      <button id="7">ZoomOut</button>
+      <button id="9">ZoomIn</button>
+      <button id="10">Info</button>
     </joystick>
   </SlideShow>
   <ScreenCalibration>
     <joystick name="WiiRemote">
       <button id="5">NextCalibration</button>
-      <button id="10">NextResolution</button>
-      <button id="11">ResetResolution</button>
+      <button id="11">ResetCalibration</button>
     </joystick>
   </ScreenCalibration>
   <SelectDialog>
@@ -174,13 +173,12 @@
   <VideoOSD>
     <joystick name="WiiRemote">
       <button id="6">Close</button>
+      <button id="10">CodecInfo</button>
     </joystick>
   </VideoOSD>
   <VideoMenu>
     <joystick name="WiiRemote">
-      <button id="5">Select</button>
-      <button id="10">Info</button>
-      <button id="11">AspectRatio</button>
+      <button id="6">PreviousMenu</button>
     </joystick>
   </VideoMenu>
   <OSDVideoSettings>
@@ -202,13 +200,13 @@
   <MyVideoLibrary>
     <joystick name="WiiRemote">
       <button id="6">ParentDir</button>
-      <button id="11">Playlist</button>
+      <button id="11">Delete</button>
     </joystick>
   </MyVideoLibrary>
   <MyVideoFiles>
     <joystick name="WiiRemote">
       <button id="6">ParentDir</button>
-      <button id="11">Playlist</button>
+      <button id="11">Delete</button>
     </joystick>
   </MyVideoFiles>
   <MyVideoPlaylist>
@@ -221,7 +219,6 @@
   </MyVideoPlaylist>
   <VirtualKeyboard>
     <joystick name="WiiRemote">
-      <button id="6">Shift</button>
       <button id="7">CursorLeft</button>
       <button id="9">CursorRight</button>
       <button id="10">Symbols</button>
@@ -233,14 +230,19 @@
       <button id="6">Close</button>
     </joystick>
   </ContextMenu>
+  <FileStackingDialog>
+    <joystick name="WiiRemote">
+      <button id="6">Close</button>
+    </joystick>
+  </FileStackingDialog>
   <Scripts>
     <joystick name="WiiRemote">
-      <button id="11">XBMC.ActivateWindow(ScriptsDebugInfo)</button>
+      <button id="10">XBMC.ActivateWindow(ScriptsDebugInfo)</button>
     </joystick>
   </Scripts>
   <ScriptsDebugInfo>
     <joystick name="WiiRemote">
-      <button id="11">Info</button>
+      <button id="10">Info</button>
     </joystick>
   </ScriptsDebugInfo>
   <NumericInput>