Clean up handling of color-theme