More keylayout updates