4 files changed, 19 insertions, 70 deletions
diff --git a/keyboards/keebzdotnet/fme/config.h b/keyboards/keebzdotnet/fme/config.h
index 03fa828fa5..bdd65f7f63 100644
--- a/keyboards/keebzdotnet/fme/config.h
+++ b/keyboards/keebzdotnet/fme/config.h
@@ -17,14 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B6, B5, B7, D2 }
-#define MATRIX_COL_PINS { B0, B4, B1, B3, B2 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
diff --git a/keyboards/keebzdotnet/fme/fme.c b/keyboards/keebzdotnet/fme/fme.c
deleted file mode 100644
index e4b37fa4a9..0000000000
--- a/keyboards/keebzdotnet/fme/fme.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 keebnewb
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "fme.h"
diff --git a/keyboards/keebzdotnet/fme/fme.h b/keyboards/keebzdotnet/fme/fme.h
deleted file mode 100644
index ff8da5d409..0000000000
--- a/keyboards/keebzdotnet/fme/fme.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
-Copyright 2021 keebnewb
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#pragma once
-
-#include "quantum.h"
-
-#define ___ KC_NO
-
-#define LAYOUT_all( \
-    k00, k13, k14, k12, k10,      \
-    k11, k04, k02, k03,           \
-    k22, k32, k21, k01            \
-){ \
-    { k00, k01, k02, k03, k04 },  \
-    { k10, k11, k12, k13, k14 },  \
-    { ___, k21, k22, ___, ___ },  \
-    { ___, ___, k32, ___, ___ }   \
-}
diff --git a/keyboards/keebzdotnet/fme/info.json b/keyboards/keebzdotnet/fme/info.json
index 51691bbce4..72466f53d1 100644
--- a/keyboards/keebzdotnet/fme/info.json
+++ b/keyboards/keebzdotnet/fme/info.json
@@ -8,6 +8,11 @@
         "pid": "0x8008",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B0", "B4", "B1", "B3", "B2"],
+        "rows": ["B6", "B5", "B7", "D2"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layout_aliases": {
@@ -16,21 +21,22 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"label":"k00", "x":0, "y":0},
-                {"label":"k13", "x":1, "y":0},
-                {"label":"k14", "x":2, "y":0},
-                {"label":"k12", "x":3, "y":0},
-                {"label":"k10", "x":4, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [1, 3], "x": 1, "y": 0},
+                {"matrix": [1, 4], "x": 2, "y": 0},
+                {"matrix": [1, 2], "x": 3, "y": 0},
+                {"matrix": [1, 0], "x": 4, "y": 0},
+
+                {"matrix": [1, 1], "x": 0.25, "y": 1},
+                {"matrix": [0, 4], "x": 1.25, "y": 1},
+                {"matrix": [0, 2], "x": 2.25, "y": 1},
+                {"matrix": [0, 3], "x": 3.25, "y": 1, "w": 1.75},
 
-                {"label":"k11", "x":0.25, "y":1},
-                {"label":"k04", "x":1.25, "y":1},
-                {"label":"k02", "x":2.25, "y":1},
-                {"label":"k03", "x":3.25, "y":1, "w":1.75},
+                {"matrix": [2, 2], "x": 0.25, "y": 2, "w": 2.75},
+                {"matrix": [3, 2], "x": 3, "y": 3},
 
-                {"label":"k22", "x":0.25, "y":2, "w":2.75},
-                {"label":"k32", "x":3, "y":3},
-                {"label":"k21", "x":3, "y":2, "w":2},
-                {"label":"k01", "x":4, "y":3}
+                {"matrix": [2, 1], "x": 3, "y": 2, "w": 2},
+                {"matrix": [0, 1], "x": 4, "y": 3}
             ]
         }
     }