4 files changed, 32 insertions, 57 deletions
diff --git a/keyboards/unikeyboard/felix/config.h b/keyboards/unikeyboard/felix/config.h
index a3a667d632..7bc78f68d6 100644
--- a/keyboards/unikeyboard/felix/config.h
+++ b/keyboards/unikeyboard/felix/config.h
@@ -1,22 +1,5 @@
 #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 { B2, B3, B1, F7, F6 }
-#define MATRIX_COL_PINS { B5, B4, E6, D7 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/unikeyboard/felix/felix.c b/keyboards/unikeyboard/felix/felix.c
deleted file mode 100644
index 013360d043..0000000000
--- a/keyboards/unikeyboard/felix/felix.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "felix.h"
diff --git a/keyboards/unikeyboard/felix/felix.h b/keyboards/unikeyboard/felix/felix.h
deleted file mode 100644
index f43a586c8e..0000000000
--- a/keyboards/unikeyboard/felix/felix.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_ortho_5x4( \
-    K000, K001, K002, K003, \
-    K100, K101, K102, K103, \
-    K200, K201, K202, K203, \
-    K300, K301, K302, K303, \
-    K400, K401, K402, K403  \
-) { \
-    { K000, K001, K002, K003 }, \
-    { K100, K101, K102, K103 }, \
-    { K200, K201, K202, K203 }, \
-    { K300, K301, K302, K303 }, \
-    { K400, K401, K402, K403 }  \
-}
-
-#define LAYOUT LAYOUT_ortho_5x4
diff --git a/keyboards/unikeyboard/felix/info.json b/keyboards/unikeyboard/felix/info.json
index ee74cb134f..7c5a013d8a 100644
--- a/keyboards/unikeyboard/felix/info.json
+++ b/keyboards/unikeyboard/felix/info.json
@@ -8,6 +8,11 @@
     "pid": "0x6060",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["B5", "B4", "E6", "D7"],
+    "rows": ["B2", "B3", "B1", "F7", "F6"]
+  },
+  "diode_direction": "ROW2COL",
   "backlight": {
     "pin": "C6",
     "levels": 5
@@ -15,29 +20,36 @@
   "processor": "atmega32u4",
   "bootloader": "caterina",
   "community_layouts": ["ortho_5x4"],
+  "layout_aliases": {
+    "LAYOUT": "LAYOUT_ortho_5x4"
+  },
   "layouts": {
     "LAYOUT_ortho_5x4": {
       "layout": [
-        {"label":"K000", "x":0, "y":0},
-        {"label":"K001", "x":1, "y":0},
-        {"label":"K002", "x":2, "y":0},
-        {"label":"K003", "x":3, "y":0},
-        {"label":"K100", "x":0, "y":1},
-        {"label":"K101", "x":1, "y":1},
-        {"label":"K102", "x":2, "y":1},
-        {"label":"K103", "x":3, "y":1},
-        {"label":"K200", "x":0, "y":2},
-        {"label":"K201", "x":1, "y":2},
-        {"label":"K202", "x":2, "y":2},
-        {"label":"K203", "x":3, "y":2},
-        {"label":"K300", "x":0, "y":3},
-        {"label":"K301", "x":1, "y":3},
-        {"label":"K302", "x":2, "y":3},
-        {"label":"K303", "x":3, "y":3},
-        {"label":"K400", "x":0, "y":4},
-        {"label":"K401", "x":1, "y":4},
-        {"label":"K402", "x":2, "y":4},
-        {"label":"K403", "x":3, "y":4}
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+        {"matrix": [3, 3], "x": 3, "y": 3},
+
+        {"matrix": [4, 0], "x": 0, "y": 4},
+        {"matrix": [4, 1], "x": 1, "y": 4},
+        {"matrix": [4, 2], "x": 2, "y": 4},
+        {"matrix": [4, 3], "x": 3, "y": 4}
       ]
     }
   }