Final changes for CSS Refactor