Master

fixed setting values will overwrite colors that have been set