less watch fix and color refactoring