WIP: apply new styles