Move more stuff out of the in-widget stylesheets
Merge branch 'master' into next-up-at-helpdesk