WIP: Refactor a lot of styles