6 files changed, 14 insertions, 64 deletions
diff --git a/keyboards/rgbkb/sol/keymaps/brianweyer/config.h b/keyboards/rgbkb/sol/keymaps/brianweyer/config.h
deleted file mode 100644
index 452cdda823..0000000000
--- a/keyboards/rgbkb/sol/keymaps/brianweyer/config.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 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
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-// place overrides here
-
diff --git a/keyboards/rgbkb/sol/keymaps/danielhklein/config.h b/keyboards/rgbkb/sol/keymaps/danielhklein/config.h
deleted file mode 100644
index 452cdda823..0000000000
--- a/keyboards/rgbkb/sol/keymaps/danielhklein/config.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 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
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-// place overrides here
-
diff --git a/keyboards/rgbkb/sol/rev1/config.h b/keyboards/rgbkb/sol/rev1/config.h
index a41959a88b..575e393b1d 100644
--- a/keyboards/rgbkb/sol/rev1/config.h
+++ b/keyboards/rgbkb/sol/rev1/config.h
@@ -19,10 +19,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 #ifdef LED_MIRRORED
-  #define RGBLED_NUM 35
+  #define RGBLIGHT_LED_COUNT 35
 #else
-  #define RGBLED_NUM 70
+  #define RGBLIGHT_LED_COUNT 70
 #endif
-#define RGB_MATRIX_LED_COUNT  RGBLED_NUM
+#define RGB_MATRIX_LED_COUNT  RGBLIGHT_LED_COUNT
 
 #define RGB_MATRIX_CENTER { 112, 35 }
diff --git a/keyboards/rgbkb/sol/rev2/config.h b/keyboards/rgbkb/sol/rev2/config.h
index 19680c84b3..7016cf7744 100644
--- a/keyboards/rgbkb/sol/rev2/config.h
+++ b/keyboards/rgbkb/sol/rev2/config.h
@@ -24,28 +24,28 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifdef LED_MIRRORED
   #ifdef FULLHAND_ENABLE
     #define FULLHAND_LEDS 24
-    #define RGBLED_NUM 74
+    #define RGBLIGHT_LED_COUNT 74
   #elif SF_ENABLE
     #define FULLHAND_LEDS 38
-    #define RGBLED_NUM 81
+    #define RGBLIGHT_LED_COUNT 81
   #else
     #define FULLHAND_LEDS 0
-    #define RGBLED_NUM 62
+    #define RGBLIGHT_LED_COUNT 62
   #endif
 #else
   #ifdef FULLHAND_ENABLE
     #define FULLHAND_LEDS 24
-    #define RGBLED_NUM 148
+    #define RGBLIGHT_LED_COUNT 148
   #elif SF_ENABLE
     #define FULLHAND_LEDS 38
-    #define RGBLED_NUM 162
+    #define RGBLIGHT_LED_COUNT 162
   #else
     #define FULLHAND_LEDS 0
-    #define RGBLED_NUM 124
+    #define RGBLIGHT_LED_COUNT 124
   #endif
 #endif
 
-#define RGB_MATRIX_LED_COUNT  RGBLED_NUM
+#define RGB_MATRIX_LED_COUNT  RGBLIGHT_LED_COUNT
 
 #define RGB_MATRIX_CENTER { 112, 37 }
 
diff --git a/keyboards/rgbkb/zen/rev1/keymaps/default/config.h b/keyboards/rgbkb/zen/rev1/keymaps/default/config.h
index 1de23afd63..e9d6659d60 100644
--- a/keyboards/rgbkb/zen/rev1/keymaps/default/config.h
+++ b/keyboards/rgbkb/zen/rev1/keymaps/default/config.h
@@ -24,7 +24,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define MASTER_RIGHT
 // #define EE_HANDS
 
-#undef RGBLED_NUM
+#undef RGBLIGHT_LED_COUNT
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -35,7 +35,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 16
+#define RGBLIGHT_LED_COUNT 16
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/rgbkb/zygomorph/rev1/config.h b/keyboards/rgbkb/zygomorph/rev1/config.h
index 8a46a941b7..81f961540c 100644
--- a/keyboards/rgbkb/zygomorph/rev1/config.h
+++ b/keyboards/rgbkb/zygomorph/rev1/config.h
@@ -22,9 +22,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define EE_HANDS
 
 #ifndef RGBLIGHT_SPLIT_ENABLE
-    #define RGBLED_NUM 30
+    #define RGBLIGHT_LED_COUNT 30
 #else
-    #define RGBLED_NUM 60
+    #define RGBLIGHT_LED_COUNT 60
 #endif
 
 #define RGB_MATRIX_LED_COUNT 60