Integrated the new color system into the rest of the codebase