2 files changed, 21 insertions, 34 deletions
diff --git a/keyboards/pabile/p18/info.json b/keyboards/pabile/p18/info.json
index 97cca23a29..0a69a4a029 100644
--- a/keyboards/pabile/p18/info.json
+++ b/keyboards/pabile/p18/info.json
@@ -24,24 +24,27 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-              {"x":1.25, "y":0}, 
-              {"x":2.25, "y":0}, 
-              {"x":3.25, "y":0}, 
-              {"x":4.25, "y":0}, 
-              {"x":1.25, "y":1}, 
-              {"x":2.25, "y":1}, 
-              {"x":3.25, "y":1}, 
-              {"x":4.25, "y":1}, 
-              {"x":0, "y":2}, 
-              {"x":1.25, "y":2}, 
-              {"x":2.25, "y":2}, 
-              {"x":3.25, "y":2}, 
-              {"x":4.25, "y":2}, 
-              {"x":0, "y":3}, 
-              {"x":1.25, "y":3}, 
-              {"x":2.25, "y":3}, 
-              {"x":3.25, "y":3}, 
-              {"x":4.25, "y":3}
+                {"matrix": [0, 4], "x": 1.25, "y": 0},
+                {"matrix": [0, 3], "x": 2.25, "y": 0},
+                {"matrix": [0, 2], "x": 3.25, "y": 0},
+                {"matrix": [0, 1], "x": 4.25, "y": 0},
+
+                {"matrix": [1, 4], "x": 1.25, "y": 1},
+                {"matrix": [1, 3], "x": 2.25, "y": 1},
+                {"matrix": [1, 2], "x": 3.25, "y": 1},
+                {"matrix": [1, 1], "x": 4.25, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 4], "x": 1.25, "y": 2},
+                {"matrix": [2, 3], "x": 2.25, "y": 2},
+                {"matrix": [2, 2], "x": 3.25, "y": 2},
+                {"matrix": [2, 1], "x": 4.25, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 4], "x": 1.25, "y": 3},
+                {"matrix": [3, 3], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 1], "x": 4.25, "y": 3}
             ]
         }
     }
diff --git a/keyboards/pabile/p18/p18.h b/keyboards/pabile/p18/p18.h
deleted file mode 100644
index 3be26191ce..0000000000
--- a/keyboards/pabile/p18/p18.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-         k01, k02, k03, k04, \
-         k11, k12, k13, k14, \
-    k20, k21, k22, k23, k24, \
-    k30, k31, k32, k33, k34 \
-) \
-{ \
-    {KC_NO, k04, k03, k02, k01}, \
-    {KC_NO, k14, k13, k12, k11}, \
-    {k20,   k24, k23, k22, k21}, \
-    {k30,   k34, k33, k32, k31} \
-}