fixed some issues in the color system