Added colors
Changed colors
Merge branch 'research'