More comprehensive and consistent keyboard mapping