Resolved conflicts with Maxime's PR to unify the background color