6 files changed, 15 insertions, 34 deletions
diff --git a/keyboards/acheron/athena/alpha/config.h b/keyboards/acheron/athena/alpha/config.h
index 99dbd76c6f..fd6f74bf35 100644
--- a/keyboards/acheron/athena/alpha/config.h
+++ b/keyboards/acheron/athena/alpha/config.h
@@ -17,18 +17,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#include "config_common.h"
-
-#define MATRIX_ROWS 6
-#define MATRIX_COLS 17
 
 #define MATRIX_COL_PINS { A8 , B14, B12, B10, B1 , B0 , A5 , A4 , A3 , A2 , A1 , A0 , C15, A7 , B4 , B3 , A15 }
 #define MATRIX_ROW_PINS { B9 , C13, B8 , B5 , A14 , C14 }
 
 #define DIODE_DIRECTION COL2ROW
 
-#define DEBOUNCE 5
-
 #define LOCKING_SUPPORT_ENABLE
 #define LOCKING_RESYNC_ENABLE
 
@@ -38,8 +32,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define BACKLIGHT_PAL_MODE      2
 #define BACKLIGHT_LEVELS 20
 #define BACKLIGHT_BREATHING
-#define BREATHING_PERIOD 5
-#define BACKLIGHT_ON_STATE 0
 
 #define RGB_DI_PIN B15
 #define RGBLED_NUM 34
@@ -61,7 +53,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define WS2812_DMA_STREAM STM32_DMA2_STREAM5
 #define WS2812_DMA_CHANNEL 6
 
-#define LED_CAPS_LOCK_PIN A10
-
 // If this is defined, the caps lock LED will turn on and off according to the state of caps lock. If not, the LED will shine like all other LEDs despite the caps lock state.
 #define CAPSLOCK_INDICATOR
diff --git a/keyboards/acheron/athena/alpha/info.json b/keyboards/acheron/athena/alpha/info.json
index 03640fd01d..bf335285ae 100644
--- a/keyboards/acheron/athena/alpha/info.json
+++ b/keyboards/acheron/athena/alpha/info.json
@@ -3,5 +3,13 @@
     "usb": {
         "pid": "0x6584",
         "device_version": "0.0.1"
-    }
+    },
+    "backlight": {
+        "on_state": 0
+    },
+    "indicators": {
+        "caps_lock": "A10"
+    },
+    "processor": "STM32F411",
+    "bootloader": "stm32-dfu"
 }
diff --git a/keyboards/acheron/athena/alpha/rules.mk b/keyboards/acheron/athena/alpha/rules.mk
index 7711254bbe..962a27694f 100644
--- a/keyboards/acheron/athena/alpha/rules.mk
+++ b/keyboards/acheron/athena/alpha/rules.mk
@@ -1,10 +1,3 @@
-# MCU name
-MCU = STM32F411
-BOARD = GENERIC_STM32_F411XE
-
-# Bootloader selection
-BOOTLOADER = stm32-dfu
-
 # Build Options
 #   change yes to no to disable
 #
diff --git a/keyboards/acheron/athena/beta/config.h b/keyboards/acheron/athena/beta/config.h
index 4b2ae3f06b..a3a1a3b25c 100644
--- a/keyboards/acheron/athena/beta/config.h
+++ b/keyboards/acheron/athena/beta/config.h
@@ -17,18 +17,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#include "config_common.h"
-
-#define MATRIX_ROWS 6
-#define MATRIX_COLS 17
 
 #define MATRIX_COL_PINS { C7 , C6 , B14, B12, B10, B1 , C4 , A7 , A6 , A5 , A4 , A3 , A2 , C5 , A10, A8 , C9 }
 #define MATRIX_ROW_PINS { C11, C12, C10, A15, C0 , A1 }
 
 #define DIODE_DIRECTION COL2ROW
 
-#define DEBOUNCE 5
-
 #define LOCKING_SUPPORT_ENABLE
 #define LOCKING_RESYNC_ENABLE
 
@@ -38,7 +32,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define BACKLIGHT_PAL_MODE      2
 #define BACKLIGHT_LEVELS 20
 #define BACKLIGHT_BREATHING
-#define BREATHING_PERIOD 5
 
 #define RGB_DI_PIN B15
 #define RGBLED_NUM 34
@@ -61,7 +54,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define WS2812_DMA_STREAM STM32_DMA2_STREAM5
 #define WS2812_DMA_CHANNEL 6
 
-#define LED_CAPS_LOCK_PIN C8
-
 // If this is defined, the caps lock LED will turn on and off according to the state of caps lock. If not, the LED will shine like all other LEDs despite the caps lock state.
 #define CAPSLOCK_INDICATOR
diff --git a/keyboards/acheron/athena/beta/info.json b/keyboards/acheron/athena/beta/info.json
index 7db7665fe2..51c335a850 100644
--- a/keyboards/acheron/athena/beta/info.json
+++ b/keyboards/acheron/athena/beta/info.json
@@ -3,5 +3,10 @@
     "usb": {
         "pid": "0x6585",
         "device_version": "0.0.2"
-    }
+    },
+    "indicators": {
+        "caps_lock": "C8"
+    },
+    "processor": "STM32F401",
+    "bootloader": "stm32-dfu"
 }
diff --git a/keyboards/acheron/athena/beta/rules.mk b/keyboards/acheron/athena/beta/rules.mk
index 81bbce68c1..962a27694f 100644
--- a/keyboards/acheron/athena/beta/rules.mk
+++ b/keyboards/acheron/athena/beta/rules.mk
@@ -1,9 +1,3 @@
-MCU = STM32F401
-BOARD = GENERIC_STM32_F401XC
-
-# Bootloader selection
-BOOTLOADER = stm32-dfu
-
 # Build Options
 #   change yes to no to disable
 #