fixed updating highlighted style when setting button text color
Merge branch 'button-colors'