4 files changed, 6 insertions, 28 deletions
diff --git a/keyboards/kabedon/kabedon78s/config.h b/keyboards/kabedon/kabedon78s/config.h
index bd6afd6e53..c9f6428730 100644
--- a/keyboards/kabedon/kabedon78s/config.h
+++ b/keyboards/kabedon/kabedon78s/config.h
@@ -17,16 +17,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* Keyboard Matrix Assignments */
-#define MATRIX_ROW_PINS {D0,D2,F7,B1,B0,D6}
-#define MATRIX_COL_PINS {F5,F4,F6,C6,B6,B4,D3,D1,D4,F1,B3,D5,F0,C7,D7,B5,B2,E6}
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION ROW2COL
-
 #define RGB_DI_PIN B7
-#ifdef RGB_DI_PIN
   #define RGBLED_NUM 20
   #define RGBLIGHT_HUE_STEP 8
   #define RGBLIGHT_SAT_STEP 8
@@ -42,4 +33,3 @@ 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
-#endif
diff --git a/keyboards/kabedon/kabedon78s/info.json b/keyboards/kabedon/kabedon78s/info.json
index 7ca4605cef..f2fe41a517 100644
--- a/keyboards/kabedon/kabedon78s/info.json
+++ b/keyboards/kabedon/kabedon78s/info.json
@@ -8,6 +8,11 @@
     	"pid": "0x3738",
     	"device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F5", "F4", "F6", "C6", "B6", "B4", "D3", "D1", "D4", "F1", "B3", "D5", "F0", "C7", "D7", "B5", "B2", "E6"],
+        "rows": ["D0", "D2", "F7", "B1", "B0", "D6"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/kabedon/kabedon78s/kabedon78s.c b/keyboards/kabedon/kabedon78s/kabedon78s.c
deleted file mode 100644
index dc60ea752e..0000000000
--- a/keyboards/kabedon/kabedon78s/kabedon78s.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2018 MechMerlin
- *
- * 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/>.
-  */
-  
-#include "kabedon78s.h"
diff --git a/keyboards/kabedon/kabedon78s/kabedon78s.h b/keyboards/kabedon/kabedon78s/kabedon78s.h
index 72752920b7..64709a9bf4 100644
--- a/keyboards/kabedon/kabedon78s/kabedon78s.h
+++ b/keyboards/kabedon/kabedon78s/kabedon78s.h
@@ -10,7 +10,7 @@
         KE06,   KE00, KE01, KE02, KE03, KE04, KE05,         KE07, KE08, KE09, KE10, KE11, KE12, KE13,         KE14, KE15, KE16, KE17, \
         KF06,   KF00, KF01, KF02, KF03,    KF04,               KF08,    KF09, KF10, KF11, KF12, KF13,            KF14,   KF16        \
 ) { \
-  { KA00, KA01, KA02, KA03, KA04, KA05,KC_NO, KA07, KA08, KA09, KA10, KA11, KA12, KB13, KA14, KA15, KA16, KA17}, \
+  { KA00, KA01, KA02, KA03, KA04, KA05,KC_NO, KA07, KA08, KA09, KA10, KA11, KA12, KA13, KA14, KA15, KA16, KA17}, \
   { KB00, KB01, KB02, KB03, KB04, KB05, KB06, KB07, KB08, KB09, KB10, KB11, KB12, KB13, KB14, KB15, KB16, KB17}, \
   { KC00, KC01, KC02, KC03, KC04, KC05, KC06, KC07, KC08, KC09, KC10, KC11, KC12, KC13, KC14, KC15, KC16, KC17}, \
   { KD00, KD01, KD02, KD03, KD04, KD05, KD06, KD07, KD08, KD09, KD10, KD11, KD12, KD13, KD14, KD15, KD16,KC_NO}, \