Refactor styles to use more variables