Add Color controller an fix some issues.