generator bug fixed, color changes