CSS cleaned up, improving build system