Merge "Fixes wrong colors in SUW -> AllSet" into main