Add Color
Merge remote-tracking branch 'origin/Fading'