8BitDo Controller support in Kodi, trouble setting it up.

[Brewskii]

Pi Model: 3
RetroPie Version Used: 4.1.5
Built From: Pre made SD Image on RetroPie website
USB Devices connected: Keyboard, 2gb memory stick
Controller used: 8Bitdo NES30 Pro
Error messages received: none
Log found in /opt/retropie/configs/ports/kodi/temp/kodi.log
Guide used: https://github.com/retropie/retropie-setup/wiki/KODI
File: /home/pi/.kodi/userdata/keymaps/joystick.xml
Kodi 16.1 Jarvis

I'm trying to use my 8bitdo controller with kodi which is installed from within retropie.
It works great in RetroPie itself, however in kodi the buttons don't seem to correspond with the buttons in the 8bitdoNESPRO30.cfg file created when I configured my controller in RetroPie.
It appears to see the controller as if I press a button while in Kodi it wakes up the program from the screen saver.
Checking the Kodi log, I see the following relevant entries.

Kodi.log
21:28:45 5175.164062 T:1944269376 NOTICE: Found a non joystick : use it as standard kodi input device - /dev/input/event0
21:28:45 5175.283203 T:1944269376 NOTICE: Found a non joystick : use it as standard kodi input device - /dev/input/event1
21:28:45 5175.403320 T:1944269376 NOTICE: Found a joystick : use it as a joystick input device - /dev/input/event2
21:28:45 5175.445801 T:1944269376 NOTICE: Previous line repeats 1 times.
21:28:45 5175.445801 T:1944269376 NOTICE: Enabled Joystick: 8Bitdo NES30 Pro
21:28:45 5175.445801 T:1944269376 NOTICE: Details: Total Axis: 6 Total Hats: 1 Total Buttons: 16
21:28:55 5185.542969 T:1498936240 NOTICE: Found a joystick : use it as a joystick input device - /dev/input/event2

Using the Kodi section of the RetroPie wiki I tried the example and was able to navigate a bit, (left only on the left analog stick)
Example code:
<?xml version="1.0" encoding="UTF-8"?>
<keymap>
<global>
<joystick name=""8Bitdo NES30 Pro ">
<button id="3">Select</button>
<button id="2">Back</button>
<axis id="1" limit="+1">Right</axis>
<axis id="1" limit="-1">Left</axis>
<axis id="2" limit="-1">Up</axis>
<axis id="2" limit="+1">Down</axis>
</joystick>
</global>
</keymap>

I then tried modifying it with the buttons from the 8bitdoNESPRO30.cfg but they remain unresponsive in Kodi.
Modified joystick.xml file:
<?xml version="1.0" encoding="UTF-8"?>
<keymap>
<global>
<joystick name="8Bitdo NES30 Pro">
<button id="0">Select</button>
<button id="1">Back</button>
<button id="h0right">Right</button>
<button id="h0left">Left</button>
<button id="h0up">Up</button>
<button id="h0down">Down</button>
</joystick>
</global>
</keymap>

Any idea's?
Thanks in advance.