consolidate more stuff into style.less