Merge "persistent color scheme selection"