colors and styles added again
Merge origin/master