Squash all colors.xml edits