Changed the red button to purple
Changed yellow button to orange
Changed green button to white
Merge branch 'Orange'
Merge branch 'White'