Merge branch 'development'
new body color, background, border color