Changed how color scheme works