Improve keyboard support (because all my USB ports are taken right now, sigh)