Merge "Fixes previous commit with wrong updated colors" into main