Big styles refactor (wip)