6 files changed, 9 insertions, 21 deletions
diff --git a/keyboards/biacco42/ergo42/ergo42.c b/keyboards/biacco42/ergo42/ergo42.c
index bd7a7ffe19..1407d91689 100644
--- a/keyboards/biacco42/ergo42/ergo42.c
+++ b/keyboards/biacco42/ergo42/ergo42.c
@@ -1,4 +1,4 @@
-#include "ergo42.h"
+#include "quantum.h"
 
 #ifdef SWAP_HANDS_ENABLE
 __attribute__ ((weak))
diff --git a/keyboards/biacco42/ergo42/ergo42.h b/keyboards/biacco42/ergo42/ergo42.h
deleted file mode 100644
index 265e605e6c..0000000000
--- a/keyboards/biacco42/ergo42/ergo42.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#ifdef KEYBOARD_biacco42_ergo42_rev1
-    #include "rev1.h"
-#endif
diff --git a/keyboards/biacco42/ergo42/rev1/config.h b/keyboards/biacco42/ergo42/rev1/config.h
index 2ce8ad24dc..8f990eb8ed 100644
--- a/keyboards/biacco42/ergo42/rev1/config.h
+++ b/keyboards/biacco42/ergo42/rev1/config.h
@@ -19,22 +19,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-// wiring of each half
-#define MATRIX_ROW_PINS { D7, E6, B4, B5 }
-#define MATRIX_COL_PINS { F5, F6, F7, B1, B3, B2, B6 }
-// #define MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6 } //uncomment this line and comment line above if you need to reverse left-to-right key order
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* 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
 
 /* ws2812 RGB LED */
-#define RGB_DI_PIN D3
 #define RGBLED_NUM 12    // Number of LEDs
 
 /*
diff --git a/keyboards/biacco42/ergo42/rev1/info.json b/keyboards/biacco42/ergo42/rev1/info.json
index a519cb23d6..e6f81d54af 100644
--- a/keyboards/biacco42/ergo42/rev1/info.json
+++ b/keyboards/biacco42/ergo42/rev1/info.json
@@ -8,6 +8,14 @@
     "pid": "0x0042",
     "device_version": "1.0.0"
   },
+  "ws2812": {
+    "pin": "D3"
+  },
+  "matrix_pins": {
+    "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"],
+    "rows": ["D7", "E6", "B4", "B5"]
+  },
+  "diode_direction": "COL2ROW",
   "split": {
         "soft_serial_pin": "D0"
     },
diff --git a/keyboards/biacco42/ergo42/rev1/rev1.c b/keyboards/biacco42/ergo42/rev1/rev1.c
deleted file mode 100644
index 626a0893bb..0000000000
--- a/keyboards/biacco42/ergo42/rev1/rev1.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "ergo42.h"
diff --git a/keyboards/biacco42/ergo42/rev1/rev1.h b/keyboards/biacco42/ergo42/rev1/rev1.h
index 9a5aec4d26..5d92ba6752 100644
--- a/keyboards/biacco42/ergo42/rev1/rev1.h
+++ b/keyboards/biacco42/ergo42/rev1/rev1.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#include "ergo42.h"
-
 #include "quantum.h"
 
 #ifndef FLIP_HALF