Add color option to edit
Merge pull request #336 from mojotech/cs/edit-colors

Add color option to edit