2.04.0:schwarherz:40 color tweak

harrison's fixes for the last color commit.