update Tool(s) to use submenu-item