Moving from xmodmap to xkb