Added less clunky color system