Major Refactoring of CSS