Drop old <command> entirely; Updated <menu> to new definition and added <menuitem>