Cleanups, color change, color vars in less