added edit modes, more colors