Removed duplicates, compacted names

Made the names of most colors shorter, and removed some duplicate
colors.