change colors and images
Merge branch 'feature-color-set'