Organize color tags
Merge branch 'master' of https://github.com/DJCubed/shindig