3 files changed, 5 insertions, 20 deletions
diff --git a/keyboards/fjlabs/avalon/config.h b/keyboards/fjlabs/avalon/config.h
index 9975b9a513..fe7128047c 100644
--- a/keyboards/fjlabs/avalon/config.h
+++ b/keyboards/fjlabs/avalon/config.h
@@ -17,11 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#include "config_common.h"
-
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 16
 
 /*
  * Keyboard Matrix Assignments
@@ -41,20 +36,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
-/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
-#define DEBOUNCE 5
-
-/* define if matrix has ghost (lacks anti-ghosting diodes) */
-//#define MATRIX_HAS_GHOST
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* Define Indicator LED's */
-#define LED_CAPS_LOCK_PIN C7
-
 /* Define RGB Underglow */
 #define RGB_DI_PIN D6
 #define RGBLED_NUM 6
diff --git a/keyboards/fjlabs/avalon/info.json b/keyboards/fjlabs/avalon/info.json
index 040db5f197..2590221b60 100644
--- a/keyboards/fjlabs/avalon/info.json
+++ b/keyboards/fjlabs/avalon/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0015",
         "device_version": "0.0.1"
     },
+    "indicators": {
+        "caps_lock": "C7"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT_all": {
             "layout": [
diff --git a/keyboards/fjlabs/avalon/rules.mk b/keyboards/fjlabs/avalon/rules.mk
index f54595dd64..dca4b0aabb 100644
--- a/keyboards/fjlabs/avalon/rules.mk
+++ b/keyboards/fjlabs/avalon/rules.mk
@@ -1,12 +1,6 @@
-# MCU name
-MCU = atmega32u4
-
 # Processor frequency
 F_CPU = 8000000
 
-# Bootloader selection
-BOOTLOADER = atmel-dfu
-
 # Build Options
 #   change yes to no to disable
 #