color handling simplified
cleanup
new build