Consolidate more styles