ticket:5 modified all to fit widget_tweaks