Keyboard handling code moved, MPRIS v2 support added