color scheming
Merge branch 'Ren'