UPDATING COLORS
merge erros