diff --git a/drivers/avr/is31fl3731.c b/drivers/avr/is31fl3731.c
index 467aaee1df..e5941cf41e 100644
--- a/drivers/avr/is31fl3731.c
+++ b/drivers/avr/is31fl3731.c
@@ -1,4 +1,5 @@
 /* Copyright 2017 Jason Williams
+ * Copyright 2018 Jack Humbert
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/drivers/avr/is31fl3731.h b/drivers/avr/is31fl3731.h
index f3375324aa..3d30fc67b7 100644
--- a/drivers/avr/is31fl3731.h
+++ b/drivers/avr/is31fl3731.h
@@ -1,4 +1,5 @@
 /* Copyright 2017 Jason Williams
+ * Copyright 2018 Jack Humbert
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -30,8 +31,6 @@ typedef struct is31_led {
 
 extern const is31_led g_is31_leds[DRIVER_LED_TOTAL];
 
-void map_index_to_led( uint8_t index, is31_led *led );
-
 void IS31FL3731_init( uint8_t addr );
 void IS31FL3731_write_register( uint8_t addr, uint8_t reg, uint8_t data );
 void IS31FL3731_write_pwm_buffer( uint8_t addr, uint8_t *pwm_buffer );
diff --git a/keyboards/planck/light/light.c b/keyboards/planck/light/light.c
index 229b2229c8..eda9b0fac2 100644
--- a/keyboards/planck/light/light.c
+++ b/keyboards/planck/light/light.c
@@ -69,7 +69,7 @@ const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
     {0, C9_12, C8_12, C7_12},
     {0, C9_13, C8_13, C7_13},
     {0, C9_14, C8_14, C7_14},
-    {0, C9_15, C8_15, C7_15}, // middle 2u switch
+    {0, C9_15, C8_15, C6_14}, // middle 2u switch
     {1, C9_4,  C8_4,  C7_4},
     {1, C9_5,  C8_5,  C7_5},
     {1, C9_6,  C8_6,  C7_6},
@@ -128,15 +128,9 @@ const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
     {{3|(2<<4)},  {20.36*2, 21.33*3}, 1},
     {{3|(3<<4)},  {20.36*3, 21.33*3}, 1},
     {{3|(4<<4)},  {20.36*4, 21.33*3}, 1},
-#ifdef PLANCK_MIT_LAYOUT
     {{3|(5<<4)},  {20.36*5, 21.33*3}, 0},
     {{3|(5<<4)},  {20.36*5.5, 21.33*3}, 0},
-    {{3|(5<<4)},  {20.36*6, 21.33*3}, 0},
-#else
-    {{3|(5<<4)},  {20.36*5, 21.33*3}, 0},
-    {{0xFF},      {20.36*5.5, 21.33*3}, 0},
     {{3|(6<<4)},  {20.36*6, 21.33*3}, 0},
-#endif
     {{3|(7<<4)},  {20.36*7, 21.33*3}, 1},
     {{3|(8<<4)},  {20.36*8, 21.33*3}, 1},
     {{3|(9<<4)},  {20.36*9, 21.33*3}, 1},
diff --git a/quantum/rgb_matrix.h b/quantum/rgb_matrix.h
index e97f2b9395..bb0956b76e 100644
--- a/quantum/rgb_matrix.h
+++ b/quantum/rgb_matrix.h
@@ -48,7 +48,7 @@ typedef struct
 {
 	HSV color;
 	uint8_t index;
-} zeal_indicator;
+} rgb_indicator;
 
 typedef struct
 {
@@ -65,10 +65,10 @@ typedef struct
 	uint8_t effect;                     // 1 byte
 	HSV color_1;                        // 3 bytes
 	HSV color_2;                        // 3 bytes
-	zeal_indicator caps_lock_indicator;	// 4 bytes
-	zeal_indicator layer_1_indicator;	// 4 bytes
-	zeal_indicator layer_2_indicator;	// 4 bytes
-	zeal_indicator layer_3_indicator;	// 4 bytes
+	rgb_indicator caps_lock_indicator;	// 4 bytes
+	rgb_indicator layer_1_indicator;	// 4 bytes
+	rgb_indicator layer_2_indicator;	// 4 bytes
+	rgb_indicator layer_3_indicator;	// 4 bytes
 	uint16_t alphas_mods[5];            // 10 bytes
 } rgb_matrix_config;                // = 36 bytes