Fixing colors
Merge branch 'master_temp_schdl'