Colors relations fixes.
Merge branch 'dev'