Fix #76 - changing colors and some other adjustments