Keyboard = p1 gamepad = p2 please!

Yep, issue still persists in 5.3.2. This has gone on for much too long and this functionality needs to be added.