Switch to koush & CM

To fix white on white bug.