Move menu definitions inside keymap definitions