Refactor: rename and combine css files together: part 2