Add Color component back