Clean stuff up.  Add new color scheme.