VID-1308 re-org of some stylesheets