unifies colors and removes older unused colors
unifies and updates color variables
Merge branch 'color-update'

* color-update:
  unifies and updates color variables
  unifies colors and removes older unused colors

Conflicts:
	bower.json
update bower version