XKB is such a dog.. back to editing dump