creates own widgetset, fixes bug
Merge branch 'master' into thomas