6 files changed, 9 insertions, 38 deletions
diff --git a/keyboards/eek/config.h b/keyboards/eek/config.h
index b335e5c98c..73004cc215 100644
--- a/keyboards/eek/config.h
+++ b/keyboards/eek/config.h
@@ -17,16 +17,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { D7, E6, B4, B5 }
-#define MATRIX_COL_PINS { D4, C6, B6, B2, B3, B1, F7, F6, F5, F4 }
-
-
-#define DIODE_DIRECTION COL2ROW
-
-
  #define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
   #define RGBLED_NUM 36
   #define RGBLIGHT_HUE_STEP 4
   #define RGBLIGHT_SAT_STEP 8
@@ -43,7 +34,6 @@ 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
 
  #ifdef RGB_MATRIX_ENABLE
   #define RGB_MATRIX_LED_COUNT 36
diff --git a/keyboards/eek/eek.c b/keyboards/eek/eek.c
index 372956257a..8e7a19f820 100644
--- a/keyboards/eek/eek.c
+++ b/keyboards/eek/eek.c
@@ -13,7 +13,7 @@
  * 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 "eek.h"
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 
diff --git a/keyboards/eek/eek.h b/keyboards/eek/eek.h
deleted file mode 100644
index 4e4133d884..0000000000
--- a/keyboards/eek/eek.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2020 klackygears
- *
- * 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
-
-#include "quantum.h"
-
-#if defined(KEYBOARD_eek_silk_down)
-#    include "silk_down.h"
-#elif defined(KEYBOARD_eek_silk_up)
-#    include "silk_up.h"
-#endif
diff --git a/keyboards/eek/info.json b/keyboards/eek/info.json
index df7884ce42..d2d1935a74 100644
--- a/keyboards/eek/info.json
+++ b/keyboards/eek/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0002",
         "device_version": "0.0.4"
     },
+    "matrix_pins": {
+        "cols": ["D4", "C6", "B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"],
+        "rows": ["D7", "E6", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "qmk-dfu",
     "community_layouts": ["split_3x5_3"],
@@ -34,7 +39,7 @@
 
                 {"x": 6, "y": 1.5},
                 {"x": 7, "y": 1.38},
-                {"x": 8, "y": 1.0},
+                {"x": 8, "y": 1},
                 {"x": 9, "y": 1.38},
                 {"x": 10, "y": 1.88},
 
diff --git a/keyboards/eek/silk_down/silk_down.h b/keyboards/eek/silk_down/silk_down.h
index c8ececd939..23ff61e58f 100644
--- a/keyboards/eek/silk_down/silk_down.h
+++ b/keyboards/eek/silk_down/silk_down.h
@@ -15,7 +15,7 @@
  */
 #pragma once
 
-#include "eek.h"
+#include "quantum.h"
 
 /* This a shortcut to help you visually see your layout.
  *
diff --git a/keyboards/eek/silk_up/silk_up.h b/keyboards/eek/silk_up/silk_up.h
index 8b9fe39596..eebcc8fd2e 100644
--- a/keyboards/eek/silk_up/silk_up.h
+++ b/keyboards/eek/silk_up/silk_up.h
@@ -15,7 +15,7 @@
  */
 #pragma once
 
-#include "eek.h"
+#include "quantum.h"
 
 /* This a shortcut to help you visually see your layout.
  *