Revert color + refactoring
bump cwac and cleanup
bump cwac and cleanup
Merge branch 'fix-#195'