Tune colors, demo cleanup