Fixes to WidgetThemer
Fixes menus