Utilize new colorselector everywhere