fix the BKSL bug + XKB cleanup