diff --git a/system/keymaps/keyboard.xml b/system/keymaps/keyboard.xml
index f3008ad3998a6..c62918a4732f8 100644
--- a/system/keymaps/keyboard.xml
+++ b/system/keymaps/keyboard.xml
@@ -90,25 +90,29 @@
       <backslash>ToggleFullScreen</backslash>
       <!-- On a French keyboard backslash is alt gr 8 -->
       <backslash mod="ctrl,alt">ToggleFullScreen</backslash>
-      <browser_home>XBMC.ActivateWindow(Home)</browser_home>
-      <browser_favorites>ActivateWindow(Favourites)</browser_favorites>
+      <home>FirstPage</home>
+      <end>LastPage</end>
+      <!-- Multimedia keyboard keys -->
+      <browser_back>ParentDir</browser_back>
+      <browser_forward/>
       <browser_refresh/>
+      <browser_stop/>
       <browser_search/>
-      <launch_app1_pc_icon>ActivateWindow(MyPrograms)</launch_app1_pc_icon>
-      <launch_media_select>XBMC.ActivateWindow(MyMusic)</launch_media_select>
-      <play_pause>Pause</play_pause>
-      <stop>Stop</stop>
-      <volume_up>VolumeUp</volume_up>
+      <browser_favorites>ActivateWindow(Favourites)</browser_favorites>
+      <browser_home>XBMC.ActivateWindow(Home)</browser_home>
       <volume_mute>Mute</volume_mute>
       <volume_down>VolumeDown</volume_down>
+      <volume_up>VolumeUp</volume_up>
       <next_track>SkipNext</next_track>
       <prev_track>SkipPrevious</prev_track>
+      <stop>Stop</stop>
+      <play_pause>Play</play_pause>
       <launch_mail></launch_mail>
-      <key id='61620'></key>      <!-- same as above, launch_mail, but using button code (based on vkey id) -->
-      <home>FirstPage</home>
-      <end>LastPage</end>
-      <key id='65446'>ParentDir</key>
-      <key id='65459'>Play</key>
+      <launch_media_select>XBMC.ActivateWindow(MyMusic)</launch_media_select>
+      <launch_app1_pc_icon>ActivateWindow(MyPrograms)</launch_app1_pc_icon>
+      <launch_app2_pc_icon>ActivateWindow(MyPrograms)</launch_app2_pc_icon>
+      <launch_file_browser/>
+      <launch_media_center/>
       <!-- ****************************************************** -->
       <!-- MS Media Center keyboard shortcuts sent by MCE remotes -->
       <!-- See http://msdn.microsoft.com/en-us/library/bb189249.aspx -->