Move colors under c. command; add and tweak colors