updated code and label content
Merge branch 'color-scheme'