switched views to have colors
Merge remote-tracking branch 'origin/view_colors'