Changes to overall color scheme, and typical cleanup stuff