reorganized styles to be more modular