Refactor colors.xml to use more descriptive names