Added basic color support and association