4 files changed, 11 insertions, 11 deletions
diff --git a/keyboards/ein_60/config.h b/keyboards/ein_60/config.h
index 457f0a5013..63e6683f8c 100644
--- a/keyboards/ein_60/config.h
+++ b/keyboards/ein_60/config.h
@@ -17,12 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { F1, F2, F3, F4 }
-#define MATRIX_COL_PINS { A3, A2, A1, A0, F6, F5, F0, E0, E1, C0, C1, C2, C3 }
-
-#define DIODE_DIRECTION COL2ROW
-
 #ifdef OLED_ENABLE
 #    define OLED_DISPLAY_128X64
 #    define OLED_TIMEOUT 450000
@@ -35,8 +29,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define AUDIO_DAC_SAMPLE_MAX 4095U
 #endif
 
-#define RGB_DI_PIN E7
-#ifdef RGB_DI_PIN
 #    define RGBLED_NUM         38
 #    define RGBLIGHT_HUE_STEP  4
 #    define RGBLIGHT_SAT_STEP  8
@@ -53,7 +45,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              38
diff --git a/keyboards/ein_60/info.json b/keyboards/ein_60/info.json
index 3eaa251d78..0740a9273e 100644
--- a/keyboards/ein_60/info.json
+++ b/keyboards/ein_60/info.json
@@ -8,12 +8,23 @@
         "pid": "0x0003",
         "device_version": "0.0.1"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["A3", "A2", "A1", "A0", "F6", "F5", "F0", "E0", "E1", "C0", "C1", "C2", "C3"],
+        "rows": ["F1", "F2", "F3", "F4"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "B0", "pin_b": "E3"},
             {"pin_a": "C5", "pin_b": "C4"}
         ]
     },
+    "ws2812": {
+        "pin": "E7"
+    },
     "processor": "at90usb1286",
     "bootloader": "qmk-dfu",
     "layouts": {
diff --git a/keyboards/ein_60/keymaps/klackygears/config.h b/keyboards/ein_60/keymaps/klackygears/config.h
index d3b1c7b4d9..91c51cb51c 100644
--- a/keyboards/ein_60/keymaps/klackygears/config.h
+++ b/keyboards/ein_60/keymaps/klackygears/config.h
@@ -20,7 +20,6 @@
 
 #define PERMISSIVE_HOLD
 #define TAPPING_TERM 150
-#define IGNORE_MOD_TAP_INTERRUPT
 
 
 #ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/ein_60/rules.mk b/keyboards/ein_60/rules.mk
index 869c305184..648a0c38ff 100644
--- a/keyboards/ein_60/rules.mk
+++ b/keyboards/ein_60/rules.mk
@@ -11,7 +11,6 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = no      # Enable for pretty RGB matrix effects
-RGB_MATRIX_DRIVER = WS2812  # Define RGB Matrix
 ENCODER_ENABLE = yes        # Enables the use of one or more encoders
 OLED_ENABLE = yes           # Enables the use of OLED displays
 OLED_DRIVER = SSD1306