Sync with changes to Renderer interface

Also added a new menu option.