colors all working now, and set to correct values
Merge pull request #7 from adamdiy/adam-creating-edit

colors all working now, and set to correct values