Many Color-related fixes