modified the shapes colors

should merge this and remove this branch after
Merge branch 'change-element-colors'