Refactor style definitions