wip/e16menuedit/patches
