Changes to organize data inside the CSS main file