diff --git a/src/clevo_keyboard.h b/src/clevo_keyboard.h
index 057d1a3..6dfd0bb 100644
--- a/src/clevo_keyboard.h
+++ b/src/clevo_keyboard.h
@@ -174,7 +174,7 @@ static void set_next_color_whole_kb(void)
 
 	new_color_id = kbd_led_state.whole_kbd_color + 1;
 	if (new_color_id >= color_list.size) {
-		new_color_id = 0;
+		new_color_id = 1; // Skip black
 	}
 	new_color_code = color_list.colors[new_color_id].code;
 
diff --git a/src/clevo_leds.h b/src/clevo_leds.h
index 9891685..bb58624 100644
--- a/src/clevo_leds.h
+++ b/src/clevo_leds.h
@@ -131,9 +131,9 @@ static void clevo_leds_set_brightness_mc(struct led_classdev *led_cdev, enum led
 		pr_debug("clevo_leds_set_brightness_mc(): clevo_evaluate_set_brightness() failed\n");
 		return;
 	}
-	clevo_mcled_cdevs[0].brightness = brightness;
-	clevo_mcled_cdevs[1].brightness = brightness;
-	clevo_mcled_cdevs[2].brightness = brightness;
+	clevo_mcled_cdevs[0].led_cdev.brightness = brightness;
+	clevo_mcled_cdevs[1].led_cdev.brightness = brightness;
+	clevo_mcled_cdevs[2].led_cdev.brightness = brightness;
 
 	zone = mcled_cdev->subled_info[0].channel;