Adds support for additional keyboards, fix up some old keyboard maps, and a refactor for later RAIL work