fix label updates
change colors
Merge branch 'dev'