Refactored stylesheets