choose color, thumbnails, profile view
Merge remote-tracking branch 'origin/master'