Batch of misc changes to colors, config