Updated awesome-colorful-toolbar code to use constants
Merge branch 'awesome-colorful-toolbar'