Color Gradient Modification
Fixing Merge Conflicts