Extract and clean css modules. Update markup