Oops, add missing widgets.
Merge branch 'master' into wip/toholed
Update toholed support