--- a/system/keymaps/keyboard.xml	2016-09-17 16:35:20.000000000 +0100
+++ b/system/keymaps/keyboard.xml	2016-10-01 19:31:07.928719606 +0100
@@ -56,7 +56,7 @@
       <menu mod="longpress">Menu</menu>
       <c>ContextMenu</c>
       <c mod="longpress">Menu</c>
-      <space>Pause</space>
+      <space>PlayPause</space>
       <x>Stop</x>
       <period>SkipNext</period>
       <comma>SkipPrevious</comma>
@@ -321,8 +321,8 @@
       <l>NextSubtitle</l>
       <left>StepBack</left>
       <right>StepForward</right>
-      <up>ChapterOrBigStepForward</up>
-      <down>ChapterOrBigStepBack</down>
+      <up>VolumeUp</up>
+      <down>VolumeDown</down>
       <up mod="longpress">AudioNextLanguage</up>
       <down mod="longpress">NextSubtitle</down>
       <a>AudioDelay</a>
@@ -425,8 +425,8 @@
       <right>StepForward</right>
       <left mod="longpress">Rewind</left>
       <right mod="longpress">FastForward</right>
-      <up>SkipNext</up>
-      <down>SkipPrevious</down>
+      <up>VolumeUp</up>
+      <down>VolumeDown</down>
       <o>PlayerProcessInfo</o>
       <l>LockPreset</l>
       <escape>FullScreen</escape>
@@ -632,8 +632,8 @@
     <keyboard>
       <left>StepBack</left>
       <right>StepForward</right>
-      <up>Up</up>
-      <down>Down</down>
+      <up>VolumeUp</up>
+      <down>VolumeDown</down>
       <return>OSD</return>
       <enter>OSD</enter>
       <return mod="longpress">ActivateWindow(PVROSDChannels)</return>

