More cleanup. Cleaner color settings.