Forgot to manuelly merge our colors