3 files changed, 5 insertions, 23 deletions
diff --git a/keyboards/aves60/aves60.c b/keyboards/aves60/aves60.c
deleted file mode 100644
index 4931deb7c9..0000000000
--- a/keyboards/aves60/aves60.c
+++ /dev/null
@@ -1,4 +0,0 @@
-// Copyright 2021 Evelien Dekkers (@evyd13)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "aves60.h"
diff --git a/keyboards/aves60/config.h b/keyboards/aves60/config.h
index f8a64364ad..ac972e6763 100644
--- a/keyboards/aves60/config.h
+++ b/keyboards/aves60/config.h
@@ -3,25 +3,7 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { F6, F7, F5, F1, F4 }
-#define MATRIX_COL_PINS { B2, B3, D0, D1, D2, D3, C7, C6, B6, B5, B4, D7, D6, D4 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 #define RGB_DI_PIN D5
-#ifdef RGB_DI_PIN
 #define RGBLED_NUM 9
 //#    define RGBLIGHT_HUE_STEP 8
 //#    define RGBLIGHT_SAT_STEP 8
@@ -39,7 +21,6 @@
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/aves60/info.json b/keyboards/aves60/info.json
index 71420c4423..3cb54d2180 100644
--- a/keyboards/aves60/info.json
+++ b/keyboards/aves60/info.json
@@ -8,6 +8,11 @@
         "pid": "0xD408",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B2", "B3", "D0", "D1", "D2", "D3", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
+        "rows": ["F6", "F7", "F5", "F1", "F4"]
+    },
+    "diode_direction": "COL2ROW",
     "bootmagic": {
         "matrix": [4, 6]
     },