Added colors.json check, some other improvements