Add XKB support