Layer and color setting fixes