14 files changed, 9 insertions, 13 deletions
diff --git a/keyboards/aeboards/satellite/keymaps/default/keymap.c b/keyboards/aeboards/satellite/keymaps/default/keymap.c
index d48d918ca5..d48d918ca5 100755..100644
--- a/keyboards/aeboards/satellite/keymaps/default/keymap.c
+++ b/keyboards/aeboards/satellite/keymaps/default/keymap.c
diff --git a/keyboards/aeboards/satellite/keymaps/default/readme.md b/keyboards/aeboards/satellite/keymaps/default/readme.md
deleted file mode 100755
index f369959a37..0000000000
--- a/keyboards/aeboards/satellite/keymaps/default/readme.md
+++ /dev/null
@@ -1,2 +0,0 @@
-# The Default Satellite Layout
-
diff --git a/keyboards/aeboards/satellite/keymaps/via/keymap.c b/keyboards/aeboards/satellite/keymaps/via/keymap.c
index d48d918ca5..d48d918ca5 100755..100644
--- a/keyboards/aeboards/satellite/keymaps/via/keymap.c
+++ b/keyboards/aeboards/satellite/keymaps/via/keymap.c
diff --git a/keyboards/aeboards/satellite/keymaps/via/readme.md b/keyboards/aeboards/satellite/keymaps/via/readme.md
deleted file mode 100755
index cce6dfd595..0000000000
--- a/keyboards/aeboards/satellite/keymaps/via/readme.md
+++ /dev/null
@@ -1,2 +0,0 @@
-# The VIA Satellite Layout
-
diff --git a/keyboards/aeboards/satellite/keymaps/via/rules.mk b/keyboards/aeboards/satellite/keymaps/via/rules.mk
index 1e5b99807c..1e5b99807c 100755..100644
--- a/keyboards/aeboards/satellite/keymaps/via/rules.mk
+++ b/keyboards/aeboards/satellite/keymaps/via/rules.mk
diff --git a/keyboards/aeboards/satellite/readme.md b/keyboards/aeboards/satellite/readme.md
index 1de19abade..1de19abade 100755..100644
--- a/keyboards/aeboards/satellite/readme.md
+++ b/keyboards/aeboards/satellite/readme.md
diff --git a/keyboards/aeboards/satellite/rev1/config.h b/keyboards/aeboards/satellite/rev1/config.h
index b11d3a2e98..508689faf5 100755..100644
--- a/keyboards/aeboards/satellite/rev1/config.h
+++ b/keyboards/aeboards/satellite/rev1/config.h
@@ -24,13 +24,13 @@
 #define DRIVER_1_LED_TOTAL 36
 #define DRIVER_2_LED_TOTAL 36
 #define ISSI_DRIVER_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
-#define DRIVER_LED_TOTAL ISSI_DRIVER_TOTAL
+#define RGB_MATRIX_LED_COUNT ISSI_DRIVER_TOTAL
 
-#define RGB_MATRIX_STARTUP_VAL 80
+#define RGB_MATRIX_DEFAULT_VAL 80
 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
 #define RGB_MATRIX_KEYPRESSES
 #define RGB_DISABLE_WHEN_USB_SUSPENDED  // turn off effects when suspended
-#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_ALL
+#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
 
 // RGB Matrix Animation modes. Explicitly enabled
 // For full list of effects, see:
diff --git a/keyboards/aeboards/satellite/rev1/readme.md b/keyboards/aeboards/satellite/rev1/readme.md
index e3f311f6a6..e3f311f6a6 100755..100644
--- a/keyboards/aeboards/satellite/rev1/readme.md
+++ b/keyboards/aeboards/satellite/rev1/readme.md
diff --git a/keyboards/aeboards/satellite/rev1/rev1.c b/keyboards/aeboards/satellite/rev1/rev1.c
index bb66eda6fa..2858175bd9 100755..100644
--- a/keyboards/aeboards/satellite/rev1/rev1.c
+++ b/keyboards/aeboards/satellite/rev1/rev1.c
@@ -18,7 +18,7 @@
 #include "drivers/led/issi/is31fl3731.h"
 
 #ifdef RGB_MATRIX_ENABLE
-const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
  *   driver
  *   |  R location
@@ -103,11 +103,11 @@ const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
 };
 
 led_config_t g_led_config = { {
-    {   0+17,   0+16,   0+15,   0+14,   0+13,   0+12,   0+11,   0+10,   0+ 9,  18+ 0,  18+ 1,  18+ 2,  18+ 3,  18+ 4,  18+ 6 },
-    {   0+ 7,   0+ 6,   0+ 5,   0+ 4,   0+ 3,   0+ 2,   0+ 1,   0+ 0,  18+ 9,  18+10,  18+11,  18+12,  18+13,  18+14,  18+ 7 },
-    {   0+ 8,  36+14,  36+13,  36+12,  36+11,  36+10,  36+ 9,  54+ 0,  54+ 1,  54+ 2,  54+ 3,  54+ 4,  54+ 5, NO_LED,  18+ 8 },
-    {  36+15,  36+ 5,  36+ 4,  36+ 3,  36+ 2,  36+ 1,  54+ 9,  54+10,  54+11,  54+12,  54+ 6, NO_LED,  54+ 7,  54+ 8,  18+15 },
-    {  36+16,  36+ 8,  36+ 7, NO_LED, NO_LED,  36+ 0, NO_LED, NO_LED, NO_LED,  54+15,  54+16, NO_LED,  54+17,  18+17,  18+16 },
+    { 17, 16, 15, 14,     13,     12, 11,     10,     9,      18, 19, 20,     21, 22,     24 },
+    { 7,  6,  6,  4,      4,      2,  1,      0,      27,     18, 29, 30,     31, 32,     25 },
+    { 8,  50, 49, 48,     47,     46, 45,     54,     55,     56, 57, 8,      59, NO_LED, 26 },
+    { 51, 41, 40, 39,     38,     37, 63,     64,     65,     66, 60, NO_LED, 61, 62,     33 },
+    { 52, 44, 43, NO_LED, NO_LED, 36, NO_LED, NO_LED, NO_LED, 69, 70, NO_LED, 71, 35,     34 },
 }, {
     //A0 .. A17
     {112,16 }, { 97,16 }, { 82,16 }, { 67,16 }, { 52,16 }, { 37,16 }, { 22,16 }, {  4,16 }, {  6,32 },
diff --git a/keyboards/aeboards/satellite/rev1/rev1.h b/keyboards/aeboards/satellite/rev1/rev1.h
index 939adc6edb..939adc6edb 100755..100644
--- a/keyboards/aeboards/satellite/rev1/rev1.h
+++ b/keyboards/aeboards/satellite/rev1/rev1.h
diff --git a/keyboards/aeboards/satellite/rev1/rules.mk b/keyboards/aeboards/satellite/rev1/rules.mk
index f59ff57871..f59ff57871 100755..100644
--- a/keyboards/aeboards/satellite/rev1/rules.mk
+++ b/keyboards/aeboards/satellite/rev1/rules.mk
diff --git a/keyboards/aeboards/satellite/rules.mk b/keyboards/aeboards/satellite/rules.mk
index bc32615d2b..bc32615d2b 100755..100644
--- a/keyboards/aeboards/satellite/rules.mk
+++ b/keyboards/aeboards/satellite/rules.mk
diff --git a/keyboards/aeboards/satellite/satellite.c b/keyboards/aeboards/satellite/satellite.c
index 97750559db..97750559db 100755..100644
--- a/keyboards/aeboards/satellite/satellite.c
+++ b/keyboards/aeboards/satellite/satellite.c
diff --git a/keyboards/aeboards/satellite/satellite.h b/keyboards/aeboards/satellite/satellite.h
index fcd03d72e4..fcd03d72e4 100755..100644
--- a/keyboards/aeboards/satellite/satellite.h
+++ b/keyboards/aeboards/satellite/satellite.h