Fix Color Change + Sheer Force
Merge remote-tracking branch 'main/master'