add button color
Merge branch 'zxj6'