Remove keysyms.d (xcbutil), add two enum types