Keyboard always comes up as US both in tty and X and I can't find a way to change it. For X -- my xorg.conf file.