Don't always set color theme
Merged