Refactor stylesheets
Fix merge conflicts